From def07a3b4e0de0c8e51619776c7c247afa6c089d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 9 Dec 2008 15:01:15 -0800 Subject: [PATCH] lots of usb-storage quirks added --- queue-2.6.27/series | 9 + ...dd-nikon-d300-camera-to-unusual_devs.patch | 51 +++ ...-unusual_devs-entry-for-mio-c520-gps.patch | 43 ++ ...devs-entries-for-nokia-5300-and-5310.patch | 48 +++ ...nusual_devs-entry-for-the-nokia-6300.patch | 32 ++ ...usb-unusual-dev-for-mio-moov-330-gps.patch | 38 ++ ...ocera-contax-sl300r-t-digital-camera.patch | 37 ++ ...-devs-patch-for-nokia-7610-supernova.patch | 36 ++ ...support-huawei-data-card-product-ids.patch | 383 ++++++++++++++++++ ...age-unusual_devs-entry-for-nikon-d2h.patch | 34 ++ 10 files changed, 711 insertions(+) create mode 100644 queue-2.6.27/usb-add-nikon-d300-camera-to-unusual_devs.patch create mode 100644 queue-2.6.27/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch create mode 100644 queue-2.6.27/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch create mode 100644 queue-2.6.27/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch create mode 100644 queue-2.6.27/usb-unusual-dev-for-mio-moov-330-gps.patch create mode 100644 queue-2.6.27/usb-unusual-dev-for-the-kyocera-contax-sl300r-t-digital-camera.patch create mode 100644 queue-2.6.27/usb-unusual-devs-patch-for-nokia-7610-supernova.patch create mode 100644 queue-2.6.27/usb-unusual-devs-support-huawei-data-card-product-ids.patch create mode 100644 queue-2.6.27/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch diff --git a/queue-2.6.27/series b/queue-2.6.27/series index 3548873d733..4b6bd21db54 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -32,3 +32,12 @@ usb-add-zte-mf626-usb-gsm-modem-entry.patch usb-support-huawei-data-card-product-ids.patch usb-add-yiso-u893-usb-modem-vendor-and-product-ids-to-option-driver.patch usb-serial-add-more-onda-device-ids-to-option-driver.patch +usb-unusual-devs-support-huawei-data-card-product-ids.patch +usb-unusual-dev-for-mio-moov-330-gps.patch +usb-unusual-dev-for-the-kyocera-contax-sl300r-t-digital-camera.patch +usb-add-nikon-d300-camera-to-unusual_devs.patch +usb-unusual-devs-patch-for-nokia-7610-supernova.patch +usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch +usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch +usb-storage-unusual_devs-entry-for-mio-c520-gps.patch +usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch diff --git a/queue-2.6.27/usb-add-nikon-d300-camera-to-unusual_devs.patch b/queue-2.6.27/usb-add-nikon-d300-camera-to-unusual_devs.patch new file mode 100644 index 00000000000..84085d1c961 --- /dev/null +++ b/queue-2.6.27/usb-add-nikon-d300-camera-to-unusual_devs.patch @@ -0,0 +1,51 @@ +From 0047ca0a45c6a481abd467fb52d2a480ffc8c6b9 Mon Sep 17 00:00:00 2001 +From: Paul Ready +Date: Wed, 29 Oct 2008 14:25:50 -0700 +Subject: USB: add Nikon D300 camera to unusual_devs + +From: Paul Ready + +commit 0047ca0a45c6a481abd467fb52d2a480ffc8c6b9 upstream + +Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11685 + +When A Nikon D300 camera is connected to a system it is seen in +/proc/bus/pci/devices but is not accessible. + +This is seen in the above file: + +T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=03 Dev#= 11 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=04b0 ProdID=041a Rev= 1.03 +S: Manufacturer=NIKON +S: Product=NIKON DSC D300 +S: SerialNumber=000008014379 +C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr= 2mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=06(still) Sub=01 Prot=01 Driver=usbfs +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=32ms + +Cc: Alan Stern +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -418,6 +418,13 @@ UNUSUAL_DEV( 0x04b0, 0x0417, 0x0100, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY), + ++/* Reported by paul ready */ ++UNUSUAL_DEV( 0x04b0, 0x0419, 0x0100, 0x0200, ++ "NIKON", ++ "NIKON DSC D300", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY), ++ + /* Reported by Doug Maxey (dwm@austin.ibm.com) */ + UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, + "IBM", diff --git a/queue-2.6.27/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch b/queue-2.6.27/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch new file mode 100644 index 00000000000..a6aa49c0185 --- /dev/null +++ b/queue-2.6.27/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch @@ -0,0 +1,43 @@ +From a6b7b034d7f20761c55743be2acb762ce09a0c6b Mon Sep 17 00:00:00 2001 +From: Alan Stern +Date: Fri, 21 Nov 2008 16:15:12 -0500 +Subject: USB: storage: unusual_devs entry for Mio C520-GPS + +From: Alan Stern + +commit a6b7b034d7f20761c55743be2acb762ce09a0c6b upstream + +This patch (as1176) adds an unusual_devs entry for the Mio C520 GPS +unit. Other devices also based on the Mitac hardware use the same USB +interface firmware, so the Vendor and Product names are generalized. + +This fixes Bugzilla #11583. + +Signed-off-by: Alan Stern +Tested-by: Tamas Kerecsen +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -318,6 +318,18 @@ UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x + US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0), + #endif + ++/* Reported by Tamas Kerecsen ++ * Obviously the PROM has not been customized by the VAR; ++ * the Vendor and Product string descriptors are: ++ * Generic Mass Storage (PROTOTYPE--Remember to change idVendor) ++ * Generic Manufacturer (PROTOTYPE--Remember to change idVendor) ++ */ ++UNUSUAL_DEV( 0x045e, 0xffff, 0x0000, 0x0000, ++ "Mitac", ++ "GPS", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_MAX_SECTORS_64 ), ++ + /* + * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.) + * Reported by Pete Zaitcev diff --git a/queue-2.6.27/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch b/queue-2.6.27/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch new file mode 100644 index 00000000000..0fb7e933617 --- /dev/null +++ b/queue-2.6.27/usb-storage-update-unusual_devs-entries-for-nokia-5300-and-5310.patch @@ -0,0 +1,48 @@ +From 589afd3bec907f02c133d7b8185b8af534f14a8e Mon Sep 17 00:00:00 2001 +From: Alan Stern +Date: Mon, 17 Nov 2008 14:32:16 -0500 +Subject: USB: storage: update unusual_devs entries for Nokia 5300 and 5310 + +From: Alan Stern + +commit 589afd3bec907f02c133d7b8185b8af534f14a8e upstream + +This patch (as1168) updates the unusual_devs entry for the Nokia 5300. +According to Jorge Lucangeli Obes , some existing +models have a revision number lower than the lower limit of the +current entry. + +The patch also moves the entry for the Nokia 5310 to its correct place +in the file. + +Signed-off-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -167,6 +167,13 @@ UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY ), + ++/* Patch for Nokia 5310 capacity */ ++UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591, ++ "Nokia", ++ "5310", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY ), ++ + /* Reported by Mario Rettig */ + UNUSUAL_DEV( 0x0421, 0x042e, 0x0100, 0x0100, + "Nokia", +@@ -233,7 +240,7 @@ UNUSUAL_DEV( 0x0421, 0x0495, 0x0370, 0x + US_FL_MAX_SECTORS_64 ), + + /* Reported by Cedric Godin */ +-UNUSUAL_DEV( 0x0421, 0x04b9, 0x0551, 0x0551, ++UNUSUAL_DEV( 0x0421, 0x04b9, 0x0500, 0x0551, + "Nokia", + "5300", + US_SC_DEVICE, US_PR_DEVICE, NULL, diff --git a/queue-2.6.27/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch b/queue-2.6.27/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch new file mode 100644 index 00000000000..a06307a14c1 --- /dev/null +++ b/queue-2.6.27/usb-storage-updates-unusual_devs-entry-for-the-nokia-6300.patch @@ -0,0 +1,32 @@ +From 9beba53dc5c330d781ecc0ad8ea081c2d100ff9f Mon Sep 17 00:00:00 2001 +From: Alan Stern +Date: Mon, 17 Nov 2008 16:12:32 -0500 +Subject: USB: storage: updates unusual_devs entry for the Nokia 6300 + +From: Alan Stern + +commit 9beba53dc5c330d781ecc0ad8ea081c2d100ff9f upstream + +This patch (as1169) modifies the unusual_devs entry for the Nokia +6300. According to Maciej Gierok and David +McBride , the revision limits need to be wider. + +This fixes Bugzilla #11768. + +Signed-off-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -240,7 +240,7 @@ UNUSUAL_DEV( 0x0421, 0x04b9, 0x0551, 0x + US_FL_FIX_CAPACITY ), + + /* Reported by Richard Nauber */ +-UNUSUAL_DEV( 0x0421, 0x04fa, 0x0601, 0x0601, ++UNUSUAL_DEV( 0x0421, 0x04fa, 0x0550, 0x0660, + "Nokia", + "6300", + US_SC_DEVICE, US_PR_DEVICE, NULL, diff --git a/queue-2.6.27/usb-unusual-dev-for-mio-moov-330-gps.patch b/queue-2.6.27/usb-unusual-dev-for-mio-moov-330-gps.patch new file mode 100644 index 00000000000..668d657a63d --- /dev/null +++ b/queue-2.6.27/usb-unusual-dev-for-mio-moov-330-gps.patch @@ -0,0 +1,38 @@ +From e8fab4ce763c36869624c5388714ff19c30a91a7 Mon Sep 17 00:00:00 2001 +From: Frédéric Marchal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -2069,6 +2069,15 @@ UNUSUAL_DEV( 0x2770, 0x915d, 0x0010, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY ), + ++/* Reported by Frederic Marchal ++ * Mio Moov 330 ++ */ ++UNUSUAL_DEV( 0x3340, 0xffff, 0x0000, 0x0000, ++ "Mitac", ++ "Mio DigiWalker USB Sync", ++ US_SC_DEVICE,US_PR_DEVICE,NULL, ++ US_FL_MAX_SECTORS_64 ), ++ + /* Reported by Andrey Rahmatullin */ + UNUSUAL_DEV( 0x4102, 0x1020, 0x0100, 0x0100, + "iRiver", diff --git a/queue-2.6.27/usb-unusual-dev-for-the-kyocera-contax-sl300r-t-digital-camera.patch b/queue-2.6.27/usb-unusual-dev-for-the-kyocera-contax-sl300r-t-digital-camera.patch new file mode 100644 index 00000000000..70002ba0049 --- /dev/null +++ b/queue-2.6.27/usb-unusual-dev-for-the-kyocera-contax-sl300r-t-digital-camera.patch @@ -0,0 +1,37 @@ +From 74511bb340059be5a3fceb032213c7f325344694 Mon Sep 17 00:00:00 2001 +From: Jens Taprogge +Date: Sun, 26 Oct 2008 18:16:09 +0100 +Subject: USB: Unusual dev for the "Kyocera / Contax SL300R T*" digital camera. + +From: Jens Taprogge + +commit 74511bb340059be5a3fceb032213c7f325344694 upstream + +The camera reports an incorrect size and fails to handle PREVENT-ALLOW +MEDIUM REMOVAL commands. The patch marks the camera as an unusual dev +and adds the flags to enable the workarounds for both shortcomings. + +Signed-off-by: Jens Taprogge +Cc: Alan Stern +Cc: Phil Dibowitz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -333,6 +333,13 @@ UNUSUAL_DEV( 0x0482, 0x0103, 0x0100, 0x + "Finecam S5", + US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY), + ++/* Patch submitted by Jens Taprogge */ ++UNUSUAL_DEV( 0x0482, 0x0107, 0x0100, 0x0100, ++ "Kyocera", ++ "CONTAX SL300R T*", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE), ++ + /* Reported by Paul Stewart + * This entry is needed because the device reports Sub=ff */ + UNUSUAL_DEV( 0x04a4, 0x0004, 0x0001, 0x0001, diff --git a/queue-2.6.27/usb-unusual-devs-patch-for-nokia-7610-supernova.patch b/queue-2.6.27/usb-unusual-devs-patch-for-nokia-7610-supernova.patch new file mode 100644 index 00000000000..829ac23a0f9 --- /dev/null +++ b/queue-2.6.27/usb-unusual-devs-patch-for-nokia-7610-supernova.patch @@ -0,0 +1,36 @@ +From ed4103b3fcf38985995e732dab6c3e2b9693f6cb Mon Sep 17 00:00:00 2001 +From: Ricky Wong +Date: Tue, 4 Nov 2008 19:13:45 +0800 +Subject: USB: unusual devs patch for Nokia 7610 Supernova + +From: Ricky Wong + +commit ed4103b3fcf38985995e732dab6c3e2b9693f6cb upstream. + +Additional sectors were reported by the Nokia 7610 Supernova phone in +usb storage mode. The following patch rectifies the aforementioned +problem. + +Signed-off-by: Ricky Wong Yung Fei +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -253,6 +253,14 @@ UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY ), + ++/* Submitted by Ricky Wong Yung Fei */ ++/* Nokia 7610 Supernova - Too many sectors reported in usb storage mode */ ++UNUSUAL_DEV( 0x0421, 0x00f5, 0x0000, 0x0470, ++ "Nokia", ++ "7610 Supernova", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY ), ++ + /* Reported by Olaf Hering from novell bug #105878 */ + UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210, + "SMSC", diff --git a/queue-2.6.27/usb-unusual-devs-support-huawei-data-card-product-ids.patch b/queue-2.6.27/usb-unusual-devs-support-huawei-data-card-product-ids.patch new file mode 100644 index 00000000000..4109f85c96d --- /dev/null +++ b/queue-2.6.27/usb-unusual-devs-support-huawei-data-card-product-ids.patch @@ -0,0 +1,383 @@ +From 1460e5e44cc5ecad7704f63b10dcb3a59d0e008b Mon Sep 17 00:00:00 2001 +From: fangxiaozhi +Date: Wed, 15 Oct 2008 14:15:36 +0800 +Subject: USB: unusual-devs: support Huawei data card product IDs + +From: fangxiaozhi + +commit 1460e5e44cc5ecad7704f63b10dcb3a59d0e008b upstream. + +In this patch, we want to do one thing: add more Huawei product IDs into the +USB driver. Then it can support more Huawei data card devices. So to declare +the unusual device for new Huawei data card devices in unusual_devs.h and to +declare more new product IDs in option.c. + +To modify the data value and length in the function of +usb_stor_huawei_e220_init in initializers.c That's because based on the USB +standard, while sending SET_FETURE_D to the device, it requires the +corresponding data to be zero, and its sending length also must be zero. In +our old solution, it can be compatible with our WCDMA data card devices, but +can not support our CDMA data card devices. But in this new solution, it can +be compatible with all of our data card devices. + +Signed-off-by: fangxiaozhi +Signed-off-by: Phil Dibowitz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 273 ++++++++++++++++++++++++++++++++++--- + 1 file changed, 254 insertions(+), 19 deletions(-) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1635,97 +1635,332 @@ UNUSUAL_DEV( 0x1210, 0x0003, 0x0100, 0x + /* Reported by fangxiaozhi + * This brings the HUAWEI data card devices into multi-port mode + */ +-UNUSUAL_DEV( 0x12d1, 0x1001, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1001, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1004, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1004, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1401, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1401, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1403, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1402, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1405, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1403, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1406, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1404, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1408, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1405, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1409, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1406, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1410, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1407, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1411, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1408, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1412, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1409, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1413, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x140A, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1414, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x140B, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1415, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x140C, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1416, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x140D, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1417, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x140E, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1418, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x140F, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, + 0), +-UNUSUAL_DEV( 0x12d1, 0x1419, 0x0000, 0x0000, ++UNUSUAL_DEV( 0x12d1, 0x1410, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1411, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1412, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1413, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1414, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1415, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1416, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1417, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1418, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1419, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x141A, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x141B, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x141C, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x141D, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x141E, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x141F, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1420, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1421, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1422, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1423, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1424, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1425, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1426, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1427, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1428, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1429, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x142A, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x142B, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x142C, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x142D, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x142E, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x142F, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1430, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1431, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1432, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1433, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1434, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1435, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1436, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1437, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1438, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x1439, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x143A, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x143B, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x143C, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x143D, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x143E, 0x0000, 0x0000, ++ "HUAWEI MOBILE", ++ "Mass Storage", ++ US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, ++ 0), ++UNUSUAL_DEV( 0x12d1, 0x143F, 0x0000, 0x0000, + "HUAWEI MOBILE", + "Mass Storage", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init, diff --git a/queue-2.6.27/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch b/queue-2.6.27/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch new file mode 100644 index 00000000000..6daea869786 --- /dev/null +++ b/queue-2.6.27/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch @@ -0,0 +1,34 @@ +From 621b239d75b790ac66854d46b094874f69e6776e Mon Sep 17 00:00:00 2001 +From: Tobias Kunze Briseño , +Date: Mon, 24 Nov 2008 11:28:31 -0500 +Subject: USB: usb-storage: unusual_devs entry for Nikon D2H + +From: Tobias Kunze Briseño , + +commit 621b239d75b790ac66854d46b094874f69e6776e upstream + +This patch adds an unusual_devs entry for the Nikon D2H camera. + +From: Tobias Kunze Briseño , +Signed-off-by: Alan Stern +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -389,6 +389,13 @@ UNUSUAL_DEV( 0x04b0, 0x0401, 0x0200, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_CAPACITY), + ++/* Reported by Tobias Kunze Briseno */ ++UNUSUAL_DEV( 0x04b0, 0x0403, 0x0200, 0x0200, ++ "NIKON", ++ "NIKON DSC D2H", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_FIX_CAPACITY), ++ + /* Reported by Milinevsky Dmitry */ + UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, + "NIKON", -- 2.47.3