summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake2006-05-09 00:43:02 +0200
committerGreg Kroah-Hartman2006-06-22 00:04:10 +0200
commitf9347c52347f24244c550871eab8ecb0fb5704d6 (patch)
treef6060ca35c9ad6eb6804e529de6186632bb5c160
parent[PATCH] USB: shuttle_usbat: Hardcode detection of HP CDRW devices (diff)
downloadkernel-qcow2-linux-f9347c52347f24244c550871eab8ecb0fb5704d6.tar.gz
kernel-qcow2-linux-f9347c52347f24244c550871eab8ecb0fb5704d6.tar.xz
kernel-qcow2-linux-f9347c52347f24244c550871eab8ecb0fb5704d6.zip
[PATCH] USB shuttle_usbat: hardcode flash detection for now
After some further testing with my flash device I realised that our current probe doesn't always work (e.g. when no media is inserted). Now that Peter Chubb's patch has simplified the detection of 99% of the HP CD writers out there, we have a much smaller range of hardware to work with on the shared device ID, so it should be possible to try some of the previous probe options again: we just need to find another tester with a USBAT2-based HP CD writer. This patch hardcodes the flash detection until someone comes along with one of these obscure CD drives. Note that these devices are extremely rare, so even if we can't ever find a decent probe method, at least we will be supporting almost all of the USBAT-based hardware out there. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/storage/unusual_devs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index f24fa12eaedf..9f72000a0064 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -393,7 +393,7 @@ UNUSUAL_DEV( 0x04fc, 0x80c2, 0x0100, 0x0100,
UNUSUAL_DEV( 0x04e6, 0x1010, 0x0000, 0x9999,
"Shuttle/SCM",
"USBAT-02",
- US_SC_SCSI, US_PR_USBAT, init_usbat_probe,
+ US_SC_SCSI, US_PR_USBAT, init_usbat_flash,
US_FL_SINGLE_LUN),
#endif