diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-27 11:54:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-27 11:54:46 -0700 |
| commit | 7af7b6310f65f1151fb612a4199962f388f43b13 (patch) | |
| tree | 64a03ded0084bf67f0eeefab777f75c0d0ae9dca | |
| parent | ddd1a5a91cb17d2b31cfd1ddad70c15c7967c5dd (diff) | |
| download | patches-7af7b6310f65f1151fb612a4199962f388f43b13.tar.gz | |
more bugfixes
4 files changed, 98 insertions, 0 deletions
@@ -55,6 +55,7 @@ usb.current/usb-xhci-properly-set-endpoint-context-fields-for-periodic-eps.patch usb.current/usb-option-add-id-for-zte-mf-330.patch usb.current/usb-serial-pl2303-hybrid-reader-uniform-hcr331.patch usb.current/usb-serial-option-zteac8710-support-with-device-id-0xffff.patch +usb.current/usb-serial-option-add-cinterion-device-id.patch ################################# # Staging patches for 2.6.34 @@ -73,6 +74,8 @@ staging.current/staging-usbip-fix-deadlock.patch staging.current/staging-dt3155-fix-50hz-configuration.patch staging.current/staging-rtl8192su-add-support-for-belkin-f5d8053-v6.patch staging.current/staging-fix-dt3155-build.patch +staging.current/staging-rt2860-add-belkin-f5d8055-wireless-n-usb-dongle-device-id.patch +staging.current/staging-iio-fix-up-the-iio_get_new_idr_val-comment.patch ##################################################################### diff --git a/staging.current/staging-iio-fix-up-the-iio_get_new_idr_val-comment.patch b/staging.current/staging-iio-fix-up-the-iio_get_new_idr_val-comment.patch new file mode 100644 index 00000000000000..c29f8423fcee2f --- /dev/null +++ b/staging.current/staging-iio-fix-up-the-iio_get_new_idr_val-comment.patch @@ -0,0 +1,32 @@ +From akpm@linux-foundation.org Tue Apr 27 11:30:01 2010 +From: Andrew Morton <akpm@linux-foundation.org> +Date: Tue, 27 Apr 2010 11:29:54 -0700 +Subject: Staging: iio: fix up the iio_get_new_idr_val comment +To: <gregkh@suse.de> +Message-ID: <20100427112954.9b99a96a.akpm@linux-foundation.org> + +From: Andrew Morton <akpm@linux-foundation.org> + +improve the comment a bit + +Cc: Greg KH <greg@kroah.com> +Cc: Jonathan Cameron <jic23@cam.ac.uk> +Cc: Sonic Zhang <sonic.adi@gmail.com> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/iio/industrialio-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/iio/industrialio-core.c ++++ b/drivers/staging/iio/industrialio-core.c +@@ -537,7 +537,7 @@ static void iio_device_unregister_sysfs( + sysfs_remove_group(&dev_info->dev.kobj, dev_info->attrs); + } + +-/* This function return negative value if fails. */ ++/* Return a negative errno on failure */ + int iio_get_new_idr_val(struct idr *this_idr) + { + int ret; diff --git a/staging.current/staging-rt2860-add-belkin-f5d8055-wireless-n-usb-dongle-device-id.patch b/staging.current/staging-rt2860-add-belkin-f5d8055-wireless-n-usb-dongle-device-id.patch new file mode 100644 index 00000000000000..ea2cfa18184980 --- /dev/null +++ b/staging.current/staging-rt2860-add-belkin-f5d8055-wireless-n-usb-dongle-device-id.patch @@ -0,0 +1,29 @@ +From largret@gmail.com Tue Apr 27 09:35:20 2010 +From: Chris Largret <largret@gmail.com> +Date: Wed, 3 Mar 2010 05:24:26 -0600 +Subject: Staging: rt2860: add Belkin F5D8055 Wireless-N USB Dongle device id +To: Greg KH <greg@kroah.com> +Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org> +Message-ID: <d426fb281003030324v6dc6216ch53bdb30ffc18a9be@mail.gmail.com> + + +Add Belkin F5D8055 Wireless-N USB support to the rt2870 +staging driver. + +Signed-off-by: Chris Largret <largret@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/rt2860/usb_main_dev.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/staging/rt2860/usb_main_dev.c ++++ b/drivers/staging/rt2860/usb_main_dev.c +@@ -63,6 +63,7 @@ struct usb_device_id rtusb_usb_id[] = { + {USB_DEVICE(0x07D1, 0x3C11)}, /* D-Link */ + {USB_DEVICE(0x14B2, 0x3C07)}, /* AL */ + {USB_DEVICE(0x050D, 0x8053)}, /* Belkin */ ++ {USB_DEVICE(0x050D, 0x825B)}, /* Belkin */ + {USB_DEVICE(0x14B2, 0x3C23)}, /* Airlink */ + {USB_DEVICE(0x14B2, 0x3C27)}, /* Airlink */ + {USB_DEVICE(0x07AA, 0x002F)}, /* Corega */ diff --git a/usb.current/usb-serial-option-add-cinterion-device-id.patch b/usb.current/usb-serial-option-add-cinterion-device-id.patch new file mode 100644 index 00000000000000..e06a85dd4cf6c1 --- /dev/null +++ b/usb.current/usb-serial-option-add-cinterion-device-id.patch @@ -0,0 +1,34 @@ +From foo@baz Tue Apr 27 09:38:51 PDT 2010 +Date: Tue, 27 Apr 2010 09:38:51 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: USB: serial: option: add cinterion device id + +This adds a device id for a Cinterion device. + +Reported-by: John Race <John.Race@roscom.co.uk> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/option.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -378,6 +378,8 @@ static int option_resume(struct usb_ser + #define HAIER_VENDOR_ID 0x201e + #define HAIER_PRODUCT_CE100 0x2009 + ++#define CINTERION_VENDOR_ID 0x0681 ++ + /* some devices interfaces need special handling due to a number of reasons */ + enum option_blacklist_reason { + OPTION_BLACKLIST_NONE = 0, +@@ -723,6 +725,7 @@ static const struct usb_device_id option + { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)}, + { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)}, + ++ { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) }, + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); |