summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorAmaury Pouly <pamaury@rockbox.org>2011-09-05 11:37:12 +0000
committerAmaury Pouly <pamaury@rockbox.org>2011-09-05 11:37:12 +0000
commitf695681d5011ae5a14261405a6ca71dd770bdcbd (patch)
treef3402d7ed81e62f4391dd0bf9e47e68bfeacd9e3 /firmware
parent7d4fed53cc1e8b0e5aa250ebea3a1b53fc3a50b2 (diff)
downloadrockbox-f695681d5011ae5a14261405a6ca71dd770bdcbd.tar.gz
rockbox-f695681d5011ae5a14261405a6ca71dd770bdcbd.zip
usb: make sure device init happens *after* queue/thread creation
Albeit unlikely, usb_init_devide() could cause de transfer completion before queue creation and the core would push onto a uninitialized queue ! git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30433 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index 8d61f2e60c..298627c4a5 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -675,8 +675,6 @@ void usb_acknowledge(long id)
675 675
676void usb_init(void) 676void usb_init(void)
677{ 677{
678 usb_init_device();
679
680#ifdef USB_FULL_INIT 678#ifdef USB_FULL_INIT
681 usb_enable(false); 679 usb_enable(false);
682 680
@@ -690,6 +688,8 @@ void usb_init(void)
690 tick_add_task(usb_tick); 688 tick_add_task(usb_tick);
691#endif 689#endif
692#endif /* USB_FULL_INIT */ 690#endif /* USB_FULL_INIT */
691
692 usb_init_device();
693} 693}
694 694
695void usb_wait_for_disconnect(struct event_queue *q) 695void usb_wait_for_disconnect(struct event_queue *q)