summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2004-05-21 21:49:04 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2004-05-21 21:49:04 +0000
commite85acf10c8c12cf388c4a55a9cdd97af4b106882 (patch)
tree54db17d0ba7c2576bc96c2741c0cd75912d4a04c
parentef0fe8538bb5b791922f763a028c83d84c96a8c7 (diff)
downloadrockbox-e85acf10c8c12cf388c4a55a9cdd97af4b106882.tar.gz
rockbox-e85acf10c8c12cf388c4a55a9cdd97af4b106882.zip
The USB monitoring started before the ATA thread, leading to badness when Rockbox was started from flash with the USB cable inserted
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4685 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/main.c b/apps/main.c
index 7fdd30b654..042d3a81f3 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -153,8 +153,6 @@ void init(void)
153 (void)coldstart; 153 (void)coldstart;
154#endif 154#endif
155 155
156 usb_start_monitoring();
157
158 rc = ata_init(); 156 rc = ata_init();
159 if(rc) 157 if(rc)
160 { 158 {
@@ -171,6 +169,8 @@ void init(void)
171 panicf("ata: %d", rc); 169 panicf("ata: %d", rc);
172 } 170 }
173 171
172 usb_start_monitoring();
173
174 pinfo = disk_init(); 174 pinfo = disk_init();
175 if (!pinfo) 175 if (!pinfo)
176 panicf("disk: NULL"); 176 panicf("disk: NULL");