diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-04-13 17:16:50 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-04-13 17:16:50 +0000 |
commit | be77cf5279da938de8b120665fe00c9124490df5 (patch) | |
tree | 09e7ec168233f91878138caf24312b455a8ce02e /firmware/usbstack | |
parent | b90a766d0195154170b693f030f044366a15ee2c (diff) | |
download | rockbox-be77cf5279da938de8b120665fe00c9124490df5.tar.gz rockbox-be77cf5279da938de8b120665fe00c9124490df5.zip |
only reconnect mass storage if there is actually an active usb connection, with mass storage enabled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17098 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/usbstack')
-rw-r--r-- | firmware/usbstack/usb_storage.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index 1f7069dfe2..dfcd51b19e 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c | |||
@@ -306,10 +306,13 @@ void usb_storage_notify_hotswap(int volume,bool inserted) | |||
306 | void usb_storage_reconnect(void) | 306 | void usb_storage_reconnect(void) |
307 | { | 307 | { |
308 | int i; | 308 | int i; |
309 | for(i=0;i<NUM_VOLUMES;i++) | 309 | if(usb_core_driver_enabled(USB_DRIVER_MASS_STORAGE) |
310 | ejected[i] = !check_disk_present(IF_MV(i)); | 310 | && usb_inserted()) { |
311 | for(i=0;i<NUM_VOLUMES;i++) | ||
312 | ejected[i] = !check_disk_present(IF_MV(i)); | ||
311 | 313 | ||
312 | usb_request_exclusive_ata(); | 314 | usb_request_exclusive_ata(); |
315 | } | ||
313 | } | 316 | } |
314 | 317 | ||
315 | /* called by usb_code_init() */ | 318 | /* called by usb_code_init() */ |