From dsd@ntlworld.com Mon May 8 15:43:08 2006 From: Daniel Drake To: greg@kroah.com Cc: linux-usb-devel@lists.sourceforge.net Cc: usb-storage@lists.one-eyed-alien.net Cc: mdharm-usb@one-eyed-alien.net Subject: USB shuttle_usbat: hardcode flash detection for now Message-Id: <20060508224302.4B22A888119@zog.reactivated.net> Date: Mon, 8 May 2006 23:43:02 +0100 (BST) 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 Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/unusual_devs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h +++ gregkh-2.6/drivers/usb/storage/unusual_devs.h @@ -393,7 +393,7 @@ UNUSUAL_DEV( 0x04fc, 0x80c2, 0x0100, 0x 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