From af713c832a1c9efc59109f76cf563cc220f84289 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 10 Feb 2009 09:41:31 -0800 Subject: [PATCH] .27 patches --- .../revert-usb-option-add-pantech-cards.patch | 48 +++++++ queue-2.6.27/series | 5 + ...b-new-id-for-ti_usb_3410_5052-driver.patch | 57 ++++++++ ...ile-broadband-modems-to-be-supported.patch | 133 ++++++++++++++++++ ...wo-more-usb-ids-for-ti_usb_3410_5052.patch | 70 +++++++++ ...ge-add-pentax-to-the-bad-vendor-list.patch | 67 +++++++++ 6 files changed, 380 insertions(+) create mode 100644 queue-2.6.27/revert-usb-option-add-pantech-cards.patch create mode 100644 queue-2.6.27/usb-new-id-for-ti_usb_3410_5052-driver.patch create mode 100644 queue-2.6.27/usb-option-new-mobile-broadband-modems-to-be-supported.patch create mode 100644 queue-2.6.27/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch create mode 100644 queue-2.6.27/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch diff --git a/queue-2.6.27/revert-usb-option-add-pantech-cards.patch b/queue-2.6.27/revert-usb-option-add-pantech-cards.patch new file mode 100644 index 00000000000..ee5a56ba537 --- /dev/null +++ b/queue-2.6.27/revert-usb-option-add-pantech-cards.patch @@ -0,0 +1,48 @@ +From 6b40c0057a7935bcf63a38a924094c7e61d4731f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Tue, 3 Feb 2009 16:02:21 -0800 +Subject: Revert USB: option: add Pantech cards + +From: Greg Kroah-Hartman + +commit 6b40c0057a7935bcf63a38a924094c7e61d4731f upstream. + +Revert 8b6346ec899713a90890c9e832f7eff91ea73504 as these devices really +work just fine with the cdc-acm driver, as they follow the spec +properly. + +Thanks to Chuck Ebbert for pointing out the problem here. + +Cc: Chuck Ebbert +Cc: Dan Williams +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 9 --------- + 1 file changed, 9 deletions(-) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -267,12 +267,6 @@ static int option_send_setup(struct tty + #define ERICSSON_VENDOR_ID 0x0bdb + #define ERICSSON_PRODUCT_F3507G 0x1900 + +-/* Pantech products */ +-#define PANTECH_VENDOR_ID 0x106c +-#define PANTECH_PRODUCT_PC5740 0x3701 +-#define PANTECH_PRODUCT_PC5750 0x3702 /* PX-500 */ +-#define PANTECH_PRODUCT_UM150 0x3711 +- + static struct usb_device_id option_ids[] = { + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, +@@ -476,9 +470,6 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, + { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) }, +- { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5740) }, +- { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_PC5750) }, +- { USB_DEVICE(PANTECH_VENDOR_ID, PANTECH_PRODUCT_UM150) }, + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/queue-2.6.27/series b/queue-2.6.27/series index d19ec44ab29..0613c7f36b3 100644 --- a/queue-2.6.27/series +++ b/queue-2.6.27/series @@ -47,3 +47,8 @@ acpica-copy-dynamically-loaded-tables-to-local-buffer.patch acpica-add-function-to-dereference-returned-reference-objects.patch acpi-don-t-load-acpi_cpufreq-if-acpi-off.patch acpi-video-fix-reversed-brightness-behavior-on-thinkpad-sl-series.patch +revert-usb-option-add-pantech-cards.patch +usb-new-id-for-ti_usb_3410_5052-driver.patch +usb-option-new-mobile-broadband-modems-to-be-supported.patch +usb-two-more-usb-ids-for-ti_usb_3410_5052.patch +usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch diff --git a/queue-2.6.27/usb-new-id-for-ti_usb_3410_5052-driver.patch b/queue-2.6.27/usb-new-id-for-ti_usb_3410_5052-driver.patch new file mode 100644 index 00000000000..2e81b2082ec --- /dev/null +++ b/queue-2.6.27/usb-new-id-for-ti_usb_3410_5052-driver.patch @@ -0,0 +1,57 @@ +From 1a1fab513734b3a4fca1bee8229e5ff7e1cb873c Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Mon, 12 Jan 2009 13:31:16 +0100 +Subject: USB: new id for ti_usb_3410_5052 driver + +From: Oliver Neukum + +commit 1a1fab513734b3a4fca1bee8229e5ff7e1cb873c upstream. + +This adds a new device id + +Signed-off-by: Oliver Neukum +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ti_usb_3410_5052.c | 3 +++ + drivers/usb/serial/ti_usb_3410_5052.h | 2 ++ + 2 files changed, 5 insertions(+) + +--- a/drivers/usb/serial/ti_usb_3410_5052.c ++++ b/drivers/usb/serial/ti_usb_3410_5052.c +@@ -230,6 +230,7 @@ static unsigned int product_5052_count; + static struct usb_device_id ti_id_table_3410[1+TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + }; + + static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { +@@ -237,6 +238,7 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + }; + + static struct usb_device_id ti_id_table_combined[] = { +@@ -246,6 +248,7 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + { } + }; + +--- a/drivers/usb/serial/ti_usb_3410_5052.h ++++ b/drivers/usb/serial/ti_usb_3410_5052.h +@@ -27,7 +27,9 @@ + + /* Vendor and product ids */ + #define TI_VENDOR_ID 0x0451 ++#define IBM_VENDOR_ID 0x04b3 + #define TI_3410_PRODUCT_ID 0x3410 ++#define IBM_4543_PRODUCT_ID 0x4543 + #define TI_3410_EZ430_ID 0xF430 /* TI ez430 development tool */ + #define TI_5052_BOOT_PRODUCT_ID 0x5052 /* no EEPROM, no firmware */ + #define TI_5152_BOOT_PRODUCT_ID 0x5152 /* no EEPROM, no firmware */ diff --git a/queue-2.6.27/usb-option-new-mobile-broadband-modems-to-be-supported.patch b/queue-2.6.27/usb-option-new-mobile-broadband-modems-to-be-supported.patch new file mode 100644 index 00000000000..3b335691deb --- /dev/null +++ b/queue-2.6.27/usb-option-new-mobile-broadband-modems-to-be-supported.patch @@ -0,0 +1,133 @@ +From c200b9c9e8ec93cdd262cfa1699ad92e883d4876 Mon Sep 17 00:00:00 2001 +From: Dirk De Schepper +Date: Fri, 6 Feb 2009 20:48:34 +0000 +Subject: USB: option: New mobile broadband modems to be supported + +From: Dirk De Schepper + +commit c200b9c9e8ec93cdd262cfa1699ad92e883d4876 upstream. + +- New Novatel and Dell mobile broadband modem products added + - Dell pid variables used in stead of numerical PIDs for known + products + +Signed-off-by: Dirk De Schepper +Signed-off-by: Matthias Urlichs +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 84 +++++++++++++++++++++++++++++--------------- + 1 file changed, 56 insertions(+), 28 deletions(-) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -192,14 +192,15 @@ static int option_send_setup(struct tty + #define NOVATELWIRELESS_PRODUCT_MC950D 0x4400 + + /* FUTURE NOVATEL PRODUCTS */ +-#define NOVATELWIRELESS_PRODUCT_EVDO_1 0x6000 +-#define NOVATELWIRELESS_PRODUCT_HSPA_1 0x7000 +-#define NOVATELWIRELESS_PRODUCT_EMBEDDED_1 0x8000 +-#define NOVATELWIRELESS_PRODUCT_GLOBAL_1 0x9000 +-#define NOVATELWIRELESS_PRODUCT_EVDO_2 0x6001 +-#define NOVATELWIRELESS_PRODUCT_HSPA_2 0x7001 +-#define NOVATELWIRELESS_PRODUCT_EMBEDDED_2 0x8001 +-#define NOVATELWIRELESS_PRODUCT_GLOBAL_2 0x9001 ++#define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED 0X6000 ++#define NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED 0X6001 ++#define NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED 0X7000 ++#define NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED 0X7001 ++#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED 0X8000 ++#define NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED 0X8001 ++#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED 0X9000 ++#define NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED 0X9001 ++#define NOVATELWIRELESS_PRODUCT_GLOBAL 0XA001 + + /* AMOI PRODUCTS */ + #define AMOI_VENDOR_ID 0x1614 +@@ -209,6 +210,27 @@ static int option_send_setup(struct tty + + #define DELL_VENDOR_ID 0x413C + ++/* Dell modems */ ++#define DELL_PRODUCT_5700_MINICARD 0x8114 ++#define DELL_PRODUCT_5500_MINICARD 0x8115 ++#define DELL_PRODUCT_5505_MINICARD 0x8116 ++#define DELL_PRODUCT_5700_EXPRESSCARD 0x8117 ++#define DELL_PRODUCT_5510_EXPRESSCARD 0x8118 ++ ++#define DELL_PRODUCT_5700_MINICARD_SPRINT 0x8128 ++#define DELL_PRODUCT_5700_MINICARD_TELUS 0x8129 ++ ++#define DELL_PRODUCT_5720_MINICARD_VZW 0x8133 ++#define DELL_PRODUCT_5720_MINICARD_SPRINT 0x8134 ++#define DELL_PRODUCT_5720_MINICARD_TELUS 0x8135 ++#define DELL_PRODUCT_5520_MINICARD_CINGULAR 0x8136 ++#define DELL_PRODUCT_5520_MINICARD_GENERIC_L 0x8137 ++#define DELL_PRODUCT_5520_MINICARD_GENERIC_I 0x8138 ++ ++#define DELL_PRODUCT_5730_MINICARD_SPRINT 0x8180 ++#define DELL_PRODUCT_5730_MINICARD_TELUS 0x8181 ++#define DELL_PRODUCT_5730_MINICARD_VZW 0x8182 ++ + #define KYOCERA_VENDOR_ID 0x0c88 + #define KYOCERA_PRODUCT_KPC650 0x17da + #define KYOCERA_PRODUCT_KPC680 0x180a +@@ -377,31 +399,37 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_1) }, /* Novatel Global product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_2) }, /* Novatel EVDO product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_2) }, /* Novatel HSPA product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_2) }, /* Novatel Embedded product */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_2) }, /* Novatel Global product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) }, /* Novatel EVDO product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) }, /* Novatel HSPA Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) }, /* Novatel EVDO product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) }, /* Novatel HSPA product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_HIGHSPEED) }, /* Novatel EVDO Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_HIGHSPEED) }, /* Novatel HSPA Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL) }, /* Novatel Global product */ + + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) }, + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) }, + { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) }, + +- { USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8116) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8117) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8118) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8128) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8129) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8133) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8136) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8137) }, /* Dell Wireless HSDPA 5520 */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ +- { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5500_MINICARD) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5505_MINICARD) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_EXPRESSCARD) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO ExpressCard == Novatel Merlin XV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5510_EXPRESSCARD) }, /* Dell Wireless 5510 Mobile Broadband HSDPA ExpressCard == Novatel Merlin XU870 HSDPA/3G */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_SPRINT) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite E720 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5700_MINICARD_TELUS) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite ET620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_VZW) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_SPRINT) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5720_MINICARD_TELUS) }, /* Dell Wireless 5720 == Novatel EV620 CDMA/EV-DO */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ ++ { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ ++ { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ + { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */ + { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) }, + { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) }, diff --git a/queue-2.6.27/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch b/queue-2.6.27/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch new file mode 100644 index 00000000000..79a805e705c --- /dev/null +++ b/queue-2.6.27/usb-two-more-usb-ids-for-ti_usb_3410_5052.patch @@ -0,0 +1,70 @@ +From 97dcf0416e390fc5c997d4ea60e6f975c7b7a1c3 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Wed, 4 Feb 2009 16:38:33 +0100 +Subject: USB: two more usb ids for ti_usb_3410_5052 + +From: Oliver Neukum + +commit 97dcf0416e390fc5c997d4ea60e6f975c7b7a1c3 upstream. + +This patch adds device IDs and balances the counts to make the +hot ID additioning mechanism work. + +Signed-off-by: Oliver Neukum +Cc: Chris Adams +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/ti_usb_3410_5052.c | 10 +++++++--- + drivers/usb/serial/ti_usb_3410_5052.h | 2 ++ + 2 files changed, 9 insertions(+), 3 deletions(-) + +--- a/drivers/usb/serial/ti_usb_3410_5052.c ++++ b/drivers/usb/serial/ti_usb_3410_5052.c +@@ -227,13 +227,15 @@ static unsigned int product_5052_count; + /* the array dimension is the number of default entries plus */ + /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */ + /* null entry */ +-static struct usb_device_id ti_id_table_3410[1+TI_EXTRA_VID_PID_COUNT+1] = { ++static struct usb_device_id ti_id_table_3410[10+TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, + { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, + }; + +-static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = { ++static struct usb_device_id ti_id_table_5052[5+TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, +@@ -241,7 +243,7 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, + }; + +-static struct usb_device_id ti_id_table_combined[] = { ++static struct usb_device_id ti_id_table_combined[14+2*TI_EXTRA_VID_PID_COUNT+1] = { + { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) }, +@@ -249,6 +251,8 @@ static struct usb_device_id ti_id_table_ + { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, + { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, + { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, ++ { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, + { } + }; + +--- a/drivers/usb/serial/ti_usb_3410_5052.h ++++ b/drivers/usb/serial/ti_usb_3410_5052.h +@@ -30,6 +30,8 @@ + #define IBM_VENDOR_ID 0x04b3 + #define TI_3410_PRODUCT_ID 0x3410 + #define IBM_4543_PRODUCT_ID 0x4543 ++#define IBM_454B_PRODUCT_ID 0x454b ++#define IBM_454C_PRODUCT_ID 0x454c + #define TI_3410_EZ430_ID 0xF430 /* TI ez430 development tool */ + #define TI_5052_BOOT_PRODUCT_ID 0x5052 /* no EEPROM, no firmware */ + #define TI_5152_BOOT_PRODUCT_ID 0x5152 /* no EEPROM, no firmware */ diff --git a/queue-2.6.27/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch b/queue-2.6.27/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch new file mode 100644 index 00000000000..9e78ba8b2b4 --- /dev/null +++ b/queue-2.6.27/usb-usb-storage-add-pentax-to-the-bad-vendor-list.patch @@ -0,0 +1,67 @@ +From 506e9469833c66ed6bb9acd902e208f7301b6adb Mon Sep 17 00:00:00 2001 +From: Alan Stern +Date: Wed, 4 Feb 2009 15:48:03 -0500 +Subject: USB: usb-storage: add Pentax to the bad-vendor list +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +From: Alan Stern + +commit 506e9469833c66ed6bb9acd902e208f7301b6adb upstream. + +This patch (as1202) adds Pentax to usb-storage's list of bad vendors +whose devices always need the CAPACITY_HEURISTICS flag. This is in +addition to the existing entries: Nokia, Nikon, and Motorola. + +Signed-off-by: Alan Stern +Tested-by: Virgo Pärna +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/storage/scsiglue.c | 2 ++ + drivers/usb/storage/unusual_devs.h | 15 --------------- + 2 files changed, 2 insertions(+), 15 deletions(-) + +--- a/drivers/usb/storage/scsiglue.c ++++ b/drivers/usb/storage/scsiglue.c +@@ -64,6 +64,7 @@ + */ + #define VENDOR_ID_NOKIA 0x0421 + #define VENDOR_ID_NIKON 0x04b0 ++#define VENDOR_ID_PENTAX 0x0a17 + #define VENDOR_ID_MOTOROLA 0x22b8 + + /*********************************************************************** +@@ -150,6 +151,7 @@ static int slave_configure(struct scsi_d + switch (le16_to_cpu(us->pusb_dev->descriptor.idVendor)) { + case VENDOR_ID_NOKIA: + case VENDOR_ID_NIKON: ++ case VENDOR_ID_PENTAX: + case VENDOR_ID_MOTOROLA: + if (!(us->fflags & (US_FL_FIX_CAPACITY | + US_FL_CAPACITY_OK))) +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1381,21 +1381,6 @@ UNUSUAL_DEV( 0x0a17, 0x0004, 0x1000, 0x1 + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), + +- +-/* Submitted by Per Winkvist */ +-UNUSUAL_DEV( 0x0a17, 0x006, 0x0000, 0xffff, +- "Pentax", +- "Optio S/S4", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_INQUIRY ), +- +-/* Reported by Jaak Ristioja */ +-UNUSUAL_DEV( 0x0a17, 0x006e, 0x0100, 0x0100, +- "Pentax", +- "K10D", +- US_SC_DEVICE, US_PR_DEVICE, NULL, +- US_FL_FIX_CAPACITY ), +- + /* These are virtual windows driver CDs, which the zd1211rw driver + * automatically converts into WLAN devices. */ + UNUSUAL_DEV( 0x0ace, 0x2011, 0x0101, 0x0101, -- 2.47.3