diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-18 15:00:54 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-18 15:00:54 -0800 |
| commit | 71d27ed2619689ffa6c0c2f1f107f1cda44ec842 (patch) | |
| tree | a3db0c92c92de30942dbef15c554cfeff92b5d9b | |
| parent | 7b307412e8ed2b7999f73522b5096e86e2afab1a (diff) | |
| download | patches-71d27ed2619689ffa6c0c2f1f107f1cda44ec842.tar.gz | |
2.6.28-rc8-git6 resync
24 files changed, 28 insertions, 906 deletions
diff --git a/driver-core.current/driver-core-add-newlines-to-debugging-enabled-disabled-messages.patch b/driver-core.current/driver-core-add-newlines-to-debugging-enabled-disabled-messages.patch deleted file mode 100644 index f7ca15f8dd193b..00000000000000 --- a/driver-core.current/driver-core-add-newlines-to-debugging-enabled-disabled-messages.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 27160f1920f0218def61fc66a7c9f0c15f2c91be Mon Sep 17 00:00:00 2001 -From: Marcel Holtmann <marcel@holtmann.org> -Date: Sun, 30 Nov 2008 14:01:26 +0100 -Subject: driver core: add newlines to debugging enabled/disabled messages - -Both messages are missing the newline and thus dmesg output gets -scrambled. - -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - lib/dynamic_printk.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/lib/dynamic_printk.c -+++ b/lib/dynamic_printk.c -@@ -289,7 +289,7 @@ static ssize_t pr_debug_write(struct fil - dynamic_enabled = DYNAMIC_ENABLED_SOME; - err = 0; - printk(KERN_DEBUG -- "debugging enabled for module %s", -+ "debugging enabled for module %s\n", - elem->name); - } else if (!value && (elem->enable == 1)) { - elem->enable = 0; -@@ -309,7 +309,7 @@ static ssize_t pr_debug_write(struct fil - err = 0; - printk(KERN_DEBUG - "debugging disabled for module " -- "%s", elem->name); -+ "%s\n", elem->name); - } - } - } diff --git a/driver-core.current/driver-core-fix-using-ret-variable-in-unregister_dynamic_debug_module.patch b/driver-core.current/driver-core-fix-using-ret-variable-in-unregister_dynamic_debug_module.patch deleted file mode 100644 index 4a8a7a0b176176..00000000000000 --- a/driver-core.current/driver-core-fix-using-ret-variable-in-unregister_dynamic_debug_module.patch +++ /dev/null @@ -1,31 +0,0 @@ -From johfel@gmx.de Wed Nov 12 11:31:53 2008 -From: Johann Felix Soden <johfel@gmx.de> -Date: Thu, 30 Oct 2008 22:44:39 +0100 -Subject: driver core: fix using 'ret' variable in unregister_dynamic_debug_module -To: gregkh@suse.de -Cc: jbaron@redhat.com -Message-ID: <1225403079.7328.7.camel@localhost> - -From: Johann Felix Soden <johfel@users.sourceforge.net> - -The 'ret' variable is assigned, but not used in the return statement. Fix this. - -Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net> -Acked-by: Jason Baron <jbaron@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - lib/dynamic_printk.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/dynamic_printk.c -+++ b/lib/dynamic_printk.c -@@ -135,7 +135,7 @@ int unregister_dynamic_debug_module(char - nr_entries--; - out: - up(&debug_list_mutex); -- return 0; -+ return ret; - } - EXPORT_SYMBOL_GPL(unregister_dynamic_debug_module); - diff --git a/driver-core.current/xilinx_hwicap-remove-improper-wording-in-license-statement.patch b/driver-core.current/xilinx_hwicap-remove-improper-wording-in-license-statement.patch deleted file mode 100644 index b95368d8fd2546..00000000000000 --- a/driver-core.current/xilinx_hwicap-remove-improper-wording-in-license-statement.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 58907e24d366ce0037243c36dd6f726d0f413390 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@suse.de> -Date: Sat, 6 Dec 2008 21:10:51 -0800 -Subject: xilinx_hwicap: remove improper wording in license statement - -From: Greg Kroah-Hartman <gregkh@suse.de> - -GPLv2 doesn't allow additional restrictions to be imposed on any -code, so this wording needs to be removed from these files. - -Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/char/xilinx_hwicap/buffer_icap.c | 3 --- - drivers/char/xilinx_hwicap/buffer_icap.h | 3 --- - drivers/char/xilinx_hwicap/fifo_icap.c | 3 --- - drivers/char/xilinx_hwicap/fifo_icap.h | 3 --- - drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 --- - drivers/char/xilinx_hwicap/xilinx_hwicap.h | 3 --- - 6 files changed, 18 deletions(-) - ---- a/drivers/char/xilinx_hwicap/buffer_icap.c -+++ b/drivers/char/xilinx_hwicap/buffer_icap.c -@@ -21,9 +21,6 @@ - * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. - * -- * Xilinx products are not intended for use in life support appliances, -- * devices, or systems. Use in such applications is expressly prohibited. -- * - * (c) Copyright 2003-2008 Xilinx Inc. - * All rights reserved. - * ---- a/drivers/char/xilinx_hwicap/buffer_icap.h -+++ b/drivers/char/xilinx_hwicap/buffer_icap.h -@@ -21,9 +21,6 @@ - * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. - * -- * Xilinx products are not intended for use in life support appliances, -- * devices, or systems. Use in such applications is expressly prohibited. -- * - * (c) Copyright 2003-2008 Xilinx Inc. - * All rights reserved. - * ---- a/drivers/char/xilinx_hwicap/fifo_icap.c -+++ b/drivers/char/xilinx_hwicap/fifo_icap.c -@@ -21,9 +21,6 @@ - * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. - * -- * Xilinx products are not intended for use in life support appliances, -- * devices, or systems. Use in such applications is expressly prohibited. -- * - * (c) Copyright 2007-2008 Xilinx Inc. - * All rights reserved. - * ---- a/drivers/char/xilinx_hwicap/fifo_icap.h -+++ b/drivers/char/xilinx_hwicap/fifo_icap.h -@@ -21,9 +21,6 @@ - * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. - * -- * Xilinx products are not intended for use in life support appliances, -- * devices, or systems. Use in such applications is expressly prohibited. -- * - * (c) Copyright 2007-2008 Xilinx Inc. - * All rights reserved. - * ---- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c -+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c -@@ -21,9 +21,6 @@ - * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. - * -- * Xilinx products are not intended for use in life support appliances, -- * devices, or systems. Use in such applications is expressly prohibited. -- * - * (c) Copyright 2002 Xilinx Inc., Systems Engineering Group - * (c) Copyright 2004 Xilinx Inc., Systems Engineering Group - * (c) Copyright 2007-2008 Xilinx Inc. ---- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h -+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h -@@ -21,9 +21,6 @@ - * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE. - * -- * Xilinx products are not intended for use in life support appliances, -- * devices, or systems. Use in such applications is expressly prohibited. -- * - * (c) Copyright 2003-2007 Xilinx Inc. - * All rights reserved. - * @@ -11,20 +11,10 @@ gregkh.pre/detect-atomic-counter-underflows.patch ################################# # Driver core patches for 2.6.28 ################################# -driver-core.current/driver-core-fix-using-ret-variable-in-unregister_dynamic_debug_module.patch -driver-core.current/xilinx_hwicap-remove-improper-wording-in-license-statement.patch -driver-core.current/driver-core-add-newlines-to-debugging-enabled-disabled-messages.patch ################################# # USB patches for 2.6.28 ################################# -usb.current/usb-fix-problem-with-usbtmc-driver-not-loading-properly.patch -usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch -usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch -usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch -usb.current/tty-sprogii-dcc-controller-identifiers.patch -usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch -usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch ##################################################################### @@ -161,14 +151,10 @@ usb/usb-utilize-round_jiffies_up_relative.patch usb/usb-enhance-usage-of-pm_message_t.patch usb/usb-serial-usb_debug-make-static.patch usb/usb-gadget-don-t-wait-for-completion-twice.patch -usb/usbmon-drop-bogus-0t-from-usbmon.txt.patch -usb/usb-documentation-usb-gadget_serial.txt-update-to-match-driver-use_acm-behaviour.patch -usb/usb-fix-comment-about-endianness-of-descriptors.patch usb/usb-isp1760-use-a-specific-plx-bridge-instead-of-any-bdridge.patch usb/usb-isp1760-fix-probe-in-pci-glue-code.patch usb/usb-serial-fix-up-urb-status-usage.patch usb/usb-option-increase-outgoing-buffer-size-and-number.patch -usb/usb-skip-set-interface-if-already-in-altsetting-0.patch usb/usb-usb-storage-merge-dpcm-support-into-sddr09.patch usb/usb-musb-use-new-platform-data-interface-of-musb-to-replace-old-one.patch usb/usb-musb-add-blackfin-driver-to-musb-framework.patch @@ -180,9 +166,6 @@ usb/usb-musb-add-blackfin-kconfig-options-and-makefile.patch usb/usb-musb-blackfin-provides-read-write-i-o-accessor-in-header-files.patch usb/usb-musb-kill-some-compiling-warning-in-musb-blackfin-part.patch usb/usb-make-printk-messages-more-searchable.patch -usb/usb-add-5372-2303-to-pl2303.patch -usb/usb-set-correct-configuration-in-probe-of-ti_usb_3410_5052.patch -usb/usb-pl2303-add-id-for-hewlett-packard-ld220-hp-pos-pole-display.patch usb/usb-utilize-the-bus-notifiers.patch usb/usb-mark-reject-field-of-struct-urb-as-atomic_t.patch @@ -199,7 +182,7 @@ gregkh.post/usb-gotemp.patch ################################# # Staging stuff ################################# -staging/staging-move-staging-drivers-back-to-staging-specific-menu.patch +#staging/staging-move-staging-drivers-back-to-staging-specific-menu.patch staging/staging-kconfig-for-arch-arm-8300-cris.patch staging/staging-correct-dubious-use-of-x-y.patch diff --git a/staging/staging-move-staging-drivers-back-to-staging-specific-menu.patch b/staging/staging-move-staging-drivers-back-to-staging-specific-menu.patch deleted file mode 100644 index c59159720d9a41..00000000000000 --- a/staging/staging-move-staging-drivers-back-to-staging-specific-menu.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dbaryshkov@gmail.com Thu Dec 4 11:36:26 2008 -From: Dmitry Baryshkov <dbaryshkov@gmail.com> -Date: Fri, 28 Nov 2008 00:01:28 +0300 -Subject: STAGING: Move staging drivers back to staging-specific menu -Cc: Greg Kroah-Hartman <gregkh@suse.de>, Dmitry Baryshkov <dbaryshkov@gmail.com> -Message-ID: <1227819688-24035-1-git-send-email-dbaryshkov@gmail.com> - - -Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/Kconfig | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/staging/Kconfig -+++ b/drivers/staging/Kconfig -@@ -22,6 +22,8 @@ menuconfig STAGING - If in doubt, say N here. - - -+if STAGING -+ - config STAGING_EXCLUDE_BUILD - bool "Exclude Staging drivers from being built" if STAGING - default y -@@ -62,3 +64,4 @@ source "drivers/staging/at76_usb/Kconfig - source "drivers/staging/poch/Kconfig" - - endif # !STAGING_EXCLUDE_BUILD -+endif # STAGING diff --git a/usb.current/tty-sprogii-dcc-controller-identifiers.patch b/usb.current/tty-sprogii-dcc-controller-identifiers.patch deleted file mode 100644 index cea7f1ce32aa5d..00000000000000 --- a/usb.current/tty-sprogii-dcc-controller-identifiers.patch +++ /dev/null @@ -1,48 +0,0 @@ -From akpm@linux-foundation.org Tue Dec 9 20:25:33 2008 -From: Alan Cox <alan@redhat.com> -Date: Sat, 06 Dec 2008 23:46:04 -0800 -Subject: USB: tty: SprogII DCC controller identifiers -To: mm-commits@vger.kernel.org -Cc: alan@redhat.com, greg@kroah.com -Message-ID: <200812070746.mB77k4wi004488@imap1.linux-foundation.org> - -From: Alan Cox <alan@redhat.com> - -Someone on rmweb reminded me this had been overlooked from ages ago.. - -Add the identifiers for the Sprog II USB. This is a DCC control interface -using the FTDI-SIO hardware: http://www.sprog-dcc.co.uk/. People have been -using it with insmod options for ages, this just puts it into the driver -data. - -Signed-off-by: Alan Cox <alan@redhat.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 1 + - drivers/usb/serial/ftdi_sio.h | 3 +++ - 2 files changed, 4 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -166,6 +166,7 @@ static struct usb_device_id id_table_com - { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_PID) }, - { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) }, - { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) }, - { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_XF_547_PID) }, ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -75,6 +75,9 @@ - /* OpenDCC (www.opendcc.de) product id */ - #define FTDI_OPENDCC_PID 0xBFD8 - -+/* Sprog II (Andrew Crosland's SprogII DCC interface) */ -+#define FTDI_SPROG_II 0xF0C8 -+ - /* www.crystalfontz.com devices - thanx for providing free devices for evaluation ! */ - /* they use the ftdi chipset for the USB interface and the vendor id is the same */ - #define FTDI_XF_632_PID 0xFC08 /* 632: 16x2 Character Display */ diff --git a/usb.current/usb-fix-problem-with-usbtmc-driver-not-loading-properly.patch b/usb.current/usb-fix-problem-with-usbtmc-driver-not-loading-properly.patch deleted file mode 100644 index 7fab6dbf053fe6..00000000000000 --- a/usb.current/usb-fix-problem-with-usbtmc-driver-not-loading-properly.patch +++ /dev/null @@ -1,30 +0,0 @@ -From foo@baz Wed Dec 3 16:33:09 PST 2008 -Date: Wed, 03 Dec 2008 16:33:09 -0800 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: fix problem with usbtmc driver not loading properly - -From: Greg Kroah-Hartman <gregkh@suse.de> - -The usbtmc driver forgot to export its device table to userspace. -Without this, it is never loaded properly when such a device is seen by -the system. - -Cc: Marcel Janssen <marcel.janssen@admesy.nl> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/class/usbtmc.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/class/usbtmc.c -+++ b/drivers/usb/class/usbtmc.c -@@ -51,6 +51,7 @@ static struct usb_device_id usbtmc_devic - { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, - { 0, } /* terminating entry */ - }; -+MODULE_DEVICE_TABLE(usb, usbtmc_devices); - - /* - * This structure is the capabilities for the device diff --git a/usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch b/usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch deleted file mode 100644 index bd3d4ea10f3965..00000000000000 --- a/usb.current/usb-ftdi_sio-adding-ewert-energy-system-s-candapter-pid.patch +++ /dev/null @@ -1,60 +0,0 @@ -From andrew@ewertenergy.com Tue Dec 9 20:37:43 2008 -From: Andrew Ewert <andrew@ewertenergy.com> -Date: Thu, 4 Dec 2008 09:09:59 -0600 (CST) -Subject: USB: ftdi_sio: Adding Ewert Energy System's CANdapter PID -To: linux-usb@vger.kernel.org, "Greg KH" <greg@kroah.com> -Cc: andrew@ewertenergy.com -Message-ID: <200812041509.mB4F9x4c016788@cslab.wheaton.edu> - -From: Andrew Ewert <andrew@ewertenergy.com> - -The following patch adds in the USB PID for Ewert Energy System's CANdapter -device (CANBUS to USB-Serial which uses the FTDI 245R chipset) to the ftdi_sio -device driver. - -The patch was tested successfully on Linux kernel 2.6.27 under Ubuntu. - -Relevant output from /proc/bus/usb/devices (With patch installed): - -T: Bus=01 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 2 Spd=12 MxCh= 0 -D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 8 #Cfgs= 1 -P: Vendor=0403 ProdID=9f80 Rev= 6.00 -S: Manufacturer=Ewert Energy Systems -S: Product=CANdapter -S: SerialNumber=A6RGB3Z3 -C:* #Ifs= 1 Cfg#= 1 Atr=a0 MxPwr= 90mA -I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=ftdi_sio -E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms -E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms - - -Signed-off-by: Andrew Ewert <andrew@ewertenergy.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 1 + - drivers/usb/serial/ftdi_sio.h | 3 +++ - 2 files changed, 4 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -143,6 +143,7 @@ static struct ftdi_sio_quirk ftdi_HE_TIR - static struct usb_device_id id_table_combined [] = { - { USB_DEVICE(FTDI_VID, FTDI_AMC232_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_CANUSB_PID) }, -+ { USB_DEVICE(FTDI_VID, FTDI_CANDAPTER_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_0_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_1_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_SCS_DEVICE_2_PID) }, ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -40,6 +40,9 @@ - /* AlphaMicro Components AMC-232USB01 device */ - #define FTDI_AMC232_PID 0xFF00 /* Product Id */ - -+/* www.candapter.com Ewert Energy Systems CANdapter device */ -+#define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */ -+ - /* SCS HF Radio Modems PID's (http://www.scs-ptc.com) */ - /* the VID is the standard ftdi vid (FTDI_VID) */ - #define FTDI_SCS_DEVICE_0_PID 0xD010 /* SCS PTC-IIusb */ diff --git a/usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch b/usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch deleted file mode 100644 index d87e0b018f7a7c..00000000000000 --- a/usb.current/usb-gadget-fix-rndis-working-at-high-speed.patch +++ /dev/null @@ -1,45 +0,0 @@ -From david-b@pacbell.net Tue Dec 9 20:40:02 2008 -From: David Brownell <david-b@pacbell.net> -Date: Mon, 24 Nov 2008 23:11:03 -0800 -Subject: USB: gadget: fix rndis working at high speed -To: linux-usb@vger.kernel.org -Cc: Greg KH <greg@kroah.com> -Message-ID: <200811242311.03524.david-b@pacbell.net> -Content-Disposition: inline - - -From: David Brownell <dbrownell@users.sourceforge.net> - -Fix a bug specific to highspeed mode in the recently updated RNDIS -support: it wasn't setting up the high speed notification endpoint, -which prevented high speed RNDIS links from working. - -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Tested-by: Anand Gadiyar <gadiyar@ti.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/f_rndis.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/gadget/f_rndis.c -+++ b/drivers/usb/gadget/f_rndis.c -@@ -651,6 +651,8 @@ rndis_bind(struct usb_configuration *c, - fs_in_desc.bEndpointAddress; - hs_out_desc.bEndpointAddress = - fs_out_desc.bEndpointAddress; -+ hs_notify_desc.bEndpointAddress = -+ fs_notify_desc.bEndpointAddress; - - /* copy descriptors, and track endpoint copies */ - f->hs_descriptors = usb_copy_descriptors(eth_hs_function); -@@ -662,6 +664,8 @@ rndis_bind(struct usb_configuration *c, - f->hs_descriptors, &hs_in_desc); - rndis->hs.out = usb_find_endpoint(eth_hs_function, - f->hs_descriptors, &hs_out_desc); -+ rndis->hs.notify = usb_find_endpoint(eth_hs_function, -+ f->hs_descriptors, &hs_notify_desc); - } - - rndis->port.open = rndis_open; diff --git a/usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch b/usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch deleted file mode 100644 index d05235d624106d..00000000000000 --- a/usb.current/usb-storage-unusual_devs.h-nokia-3109c-addition.patch +++ /dev/null @@ -1,52 +0,0 @@ -From boobaa@frugalware.org Tue Dec 9 20:14:32 2008 -From: CS�CSY L�szl� <boobaa@frugalware.org> -Date: Tue, 9 Dec 2008 23:39:14 +0100 -Subject: USB: storage: unusual_devs.h: Nokia 3109c addition -To: Phil Dibowitz <phil@ipom.com> -Cc: Alan Stern <stern@rowland.harvard.edu>, USB storage list <usb-storage@lists.one-eyed-alien.net> -Message-ID: <200812092339.14720.boobaa@frugalware.org> - -From: CS�CSY L�szl� <boobaa@frugalware.org> - -2.6.26(.x, cannot remember) could handle the microSD card in my Nokia -3109c attached via USB as mass storage, 2.6.27(.x, up to and included -2.6.27.8) cannot. Please find the attached patch which fixes this -regression, and a copy of /proc/bus/usb/devices with my phone plugged in -running with this patch on Frugalware. - -T: Bus=02 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 4 Spd=12 MxCh= 0 -D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 -P: Vendor=0421 ProdID=0063 Rev= 6.01 -S: Manufacturer=Nokia -S: Product=Nokia 3109c -S: SerialNumber=359561013742570 -C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA -I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage -E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms -E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms - -From: CS�CSY L�szl� <boobaa@frugalware.org> -Cc: Phil Dibowitz <phil@ipom.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - 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 -@@ -167,6 +167,13 @@ UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY ), - -+/* Reported by CSECSY Laszlo <boobaa@frugalware.org> */ -+UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x0601, -+ "Nokia", -+ "Nokia 3109c", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY ), -+ - /* Patch for Nokia 5310 capacity */ - UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591, - "Nokia", diff --git a/usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch b/usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch deleted file mode 100644 index 8cbd80f6b10115..00000000000000 --- a/usb.current/usb-storage-update-unusual_devs-entry-for-nokia-5310.patch +++ /dev/null @@ -1,34 +0,0 @@ -From stern@rowland.harvard.edu Tue Dec 9 20:44:02 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Mon, 1 Dec 2008 10:23:43 -0500 (EST) -Subject: usb-storage: update unusual_devs entry for Nokia 5310 -To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com> -Cc: Robson Roberto Souza Peixoto <robsonpeixoto@gmail.com>, USB Storage list <usb-storage@lists.one-eyed-alien.net> -Message-ID: <Pine.LNX.4.44L0.0812011022380.2212-100000@iolanthe.rowland.org> - - -This patch (as1179) updates the unusual_devs entry for Nokia's 5310 -phone to include a more recent firmware revision. - -This fixes Bugzilla #12099. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Tested-by: Robson Roberto Souza Peixoto <robsonpeixoto@gmail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - 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 -@@ -182,7 +182,7 @@ UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x - US_FL_FIX_CAPACITY ), - - /* Patch for Nokia 5310 capacity */ --UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0591, -+UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x0701, - "Nokia", - "5310", - US_SC_DEVICE, US_PR_DEVICE, NULL, diff --git a/usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch b/usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch deleted file mode 100644 index 348298d46d0881..00000000000000 --- a/usb.current/usb-unusual-devs-patch-for-nokia-3500c.patch +++ /dev/null @@ -1,45 +0,0 @@ -From themgzzy@gmail.com Tue Dec 9 20:19:22 2008 -From: Ozan Sener <themgzzy@gmail.com> -Date: Mon, 8 Dec 2008 19:15:45 +0200 -Subject: USB: Unusual devs patch for Nokia 3500c -To: stern@rowland.harvard.edu -Cc: linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net -Message-ID: <20081208191545.53367e1a@slave.domain.org> - -From: Ozan Sener <themgzzy@gmail.com> - -T: Bus=02 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 3 Spd=12 MxCh= 0 -D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 -P: Vendor=0421 ProdID=0060 Rev= 5.51 -S: Manufacturer=Nokia -S: Product=Nokia 3500c -S: SerialNumber=357687010280751 -C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA -I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage -E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms -E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms - -From: Ozan Sener <themgzzy@gmail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - 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 -@@ -167,6 +167,13 @@ UNUSUAL_DEV( 0x0421, 0x005d, 0x0001, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY ), - -+/* Reported by Ozan Sener <themgzzy@gmail.com> */ -+UNUSUAL_DEV( 0x0421, 0x0060, 0x0551, 0x0551, -+ "Nokia", -+ "3500c", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY ), -+ - /* Reported by CSECSY Laszlo <boobaa@frugalware.org> */ - UNUSUAL_DEV( 0x0421, 0x0063, 0x0001, 0x0601, - "Nokia", diff --git a/usb/usb-add-5372-2303-to-pl2303.patch b/usb/usb-add-5372-2303-to-pl2303.patch deleted file mode 100644 index cc90d9eeff69dd..00000000000000 --- a/usb/usb-add-5372-2303-to-pl2303.patch +++ /dev/null @@ -1,41 +0,0 @@ -From Matthew.Arnold-1@uts.edu.au Tue Dec 16 13:52:48 2008 -From: Matthew Arnold <Matthew.Arnold-1@uts.edu.au> -Date: Sat, 13 Dec 2008 22:42:53 +1100 -Subject: USB: add 5372:2303 to pl2303 -To: greg@kroah.com -Message-ID: <49439FBD.20504@uts.edu.au> - -This patch adds the "Superial" USB-Serial converter to pl2303 so that it -is detected, by the correct driver. Adds the relevant vendor:product -(5372:2303) to the device tables in pl2303.c & pl2303.h. The patch has -been tested against 2.6.24-22-generic. - -Signed-off-by: Matthew D Arnold <matthew.arnold-1@uts.edu.au> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/serial/pl2303.c | 1 + - drivers/usb/serial/pl2303.h | 4 ++++ - 2 files changed, 5 insertions(+) - ---- a/drivers/usb/serial/pl2303.c -+++ b/drivers/usb/serial/pl2303.c -@@ -91,6 +91,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(WS002IN_VENDOR_ID, WS002IN_PRODUCT_ID) }, - { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) }, - { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) }, -+ { USB_DEVICE(SUPERIAL_VENDOR_ID, SUPERIAL_PRODUCT_ID) }, - { } /* Terminating entry */ - }; - ---- a/drivers/usb/serial/pl2303.h -+++ b/drivers/usb/serial/pl2303.h -@@ -110,3 +110,7 @@ - /* Y.C. Cable U.S.A., Inc - USB to RS-232 */ - #define YCCABLE_VENDOR_ID 0x05ad - #define YCCABLE_PRODUCT_ID 0x0fba -+ -+/* "Superial" USB - Serial */ -+#define SUPERIAL_VENDOR_ID 0x5372 -+#define SUPERIAL_PRODUCT_ID 0x2303 diff --git a/usb/usb-add-asynchronous-autosuspend-autoresume-support.patch b/usb/usb-add-asynchronous-autosuspend-autoresume-support.patch index 32c35ba4a59e38..60cf67272c9520 100644 --- a/usb/usb-add-asynchronous-autosuspend-autoresume-support.patch +++ b/usb/usb-add-asynchronous-autosuspend-autoresume-support.patch @@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_autopm_enable() sets pm_usage_cnt to 0 and then calls --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c -@@ -1339,6 +1339,19 @@ void usb_autosuspend_work(struct work_st +@@ -1341,6 +1341,19 @@ void usb_autosuspend_work(struct work_st usb_autopm_do_device(udev, 0); } @@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * usb_autosuspend_device - delayed autosuspend of a USB device and its interfaces * @udev: the usb_device to autosuspend -@@ -1490,6 +1503,45 @@ void usb_autopm_put_interface(struct usb +@@ -1492,6 +1505,45 @@ void usb_autopm_put_interface(struct usb EXPORT_SYMBOL_GPL(usb_autopm_put_interface); /** @@ -141,7 +141,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * usb_autopm_get_interface - increment a USB interface's PM-usage counter * @intf: the usb_interface whose counter should be incremented * -@@ -1535,6 +1587,37 @@ int usb_autopm_get_interface(struct usb_ +@@ -1537,6 +1589,37 @@ int usb_autopm_get_interface(struct usb_ EXPORT_SYMBOL_GPL(usb_autopm_get_interface); /** @@ -179,7 +179,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * usb_autopm_set_interface - set a USB interface's autosuspend state * @intf: the usb_interface whose state should be set * -@@ -1561,6 +1644,9 @@ EXPORT_SYMBOL_GPL(usb_autopm_set_interfa +@@ -1563,6 +1646,9 @@ EXPORT_SYMBOL_GPL(usb_autopm_set_interfa void usb_autosuspend_work(struct work_struct *work) {} diff --git a/usb/usb-documentation-usb-gadget_serial.txt-update-to-match-driver-use_acm-behaviour.patch b/usb/usb-documentation-usb-gadget_serial.txt-update-to-match-driver-use_acm-behaviour.patch deleted file mode 100644 index cd0f75ed64e842..00000000000000 --- a/usb/usb-documentation-usb-gadget_serial.txt-update-to-match-driver-use_acm-behaviour.patch +++ /dev/null @@ -1,38 +0,0 @@ -From jacmet@sunsite.dk Tue Dec 9 20:37:00 2008 -From: Peter Korsgaard <jacmet@sunsite.dk> -Date: Thu, 4 Dec 2008 16:30:53 +0100 -Subject: USB: Documentation/usb/gadget_serial.txt: update to match driver use_acm behaviour -To: david-b@pacbell.net, greg@kroah.com -Cc: Peter Korsgaard <jacmet@sunsite.dk> -Message-ID: <1228404653-21037-1-git-send-email-jacmet@sunsite.dk> - -From: Peter Korsgaard <jacmet@sunsite.dk> - -Commit 7bb5ea54 (usb gadget serial: use composite gadget framework) -changed the default for the use_acm parameter from 0 to 1. -Update the documentation to match. - -Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> -Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/usb/gadget_serial.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/Documentation/usb/gadget_serial.txt -+++ b/Documentation/usb/gadget_serial.txt -@@ -114,11 +114,11 @@ modules. - Then you must load the gadget serial driver. To load it as an - ACM device (recommended for interoperability), do this: - -- modprobe g_serial use_acm=1 -+ modprobe g_serial - - To load it as a vendor specific bulk in/out device, do this: - -- modprobe g_serial -+ modprobe g_serial use_acm=0 - - This will also automatically load the underlying gadget peripheral - controller driver. This must be done each time you reboot the gadget diff --git a/usb/usb-enhance-usage-of-pm_message_t.patch b/usb/usb-enhance-usage-of-pm_message_t.patch index e7716d4f7020e8..303431bcde1c73 100644 --- a/usb/usb-enhance-usage-of-pm_message_t.patch +++ b/usb/usb-enhance-usage-of-pm_message_t.patch @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c -@@ -920,7 +920,7 @@ static int usb_suspend_device(struct usb +@@ -922,7 +922,7 @@ static int usb_suspend_device(struct usb } /* Caller has locked udev's pm_mutex */ @@ -73,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct usb_device_driver *udriver; int status = 0; -@@ -938,7 +938,7 @@ static int usb_resume_device(struct usb_ +@@ -940,7 +940,7 @@ static int usb_resume_device(struct usb_ udev->reset_resume = 1; udriver = to_usb_device_driver(udev->dev.driver); @@ -82,7 +82,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> done: dev_vdbg(&udev->dev, "%s: status %d\n", __func__, status); -@@ -967,7 +967,7 @@ static int usb_suspend_interface(struct +@@ -969,7 +969,7 @@ static int usb_suspend_interface(struct status = driver->suspend(intf, msg); if (status == 0) mark_quiesced(intf); @@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev_err(&intf->dev, "%s error %d\n", "suspend", status); } else { -@@ -985,7 +985,7 @@ static int usb_suspend_interface(struct +@@ -987,7 +987,7 @@ static int usb_suspend_interface(struct /* Caller has locked intf's usb_device's pm_mutex */ static int usb_resume_interface(struct usb_device *udev, @@ -100,7 +100,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct usb_driver *driver; int status = 0; -@@ -1136,10 +1136,9 @@ static inline int autosuspend_check(stru +@@ -1138,10 +1138,9 @@ static inline int autosuspend_check(stru * all the interfaces which were suspended are resumed so that they remain * in the same state as the device. * @@ -114,7 +114,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * * If the suspend succeeds, the routine recursively queues an autosuspend * request for @udev's parent device, thereby propagating the change up -@@ -1174,7 +1173,7 @@ static int usb_suspend_both(struct usb_d +@@ -1176,7 +1175,7 @@ static int usb_suspend_both(struct usb_d udev->do_remote_wakeup = device_may_wakeup(&udev->dev); @@ -123,7 +123,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> status = autosuspend_check(udev, 0); if (status < 0) goto done; -@@ -1194,13 +1193,16 @@ static int usb_suspend_both(struct usb_d +@@ -1196,13 +1195,16 @@ static int usb_suspend_both(struct usb_d /* If the suspend failed, resume interfaces that did get suspended */ if (status != 0) { @@ -142,7 +142,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> autosuspend_check(udev, status == -EBUSY); /* If the suspend succeeded then prevent any more URB submissions, -@@ -1230,6 +1232,7 @@ static int usb_suspend_both(struct usb_d +@@ -1232,6 +1234,7 @@ static int usb_suspend_both(struct usb_d /** * usb_resume_both - resume a USB device and its interfaces * @udev: the usb_device to resume @@ -150,7 +150,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * * This is the central routine for resuming USB devices. It calls the * the resume method for @udev and then calls the resume methods for all -@@ -1255,7 +1258,7 @@ static int usb_suspend_both(struct usb_d +@@ -1257,7 +1260,7 @@ static int usb_suspend_both(struct usb_d * * This routine can run only in process context. */ @@ -159,7 +159,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { int status = 0; int i; -@@ -1271,14 +1274,15 @@ static int usb_resume_both(struct usb_de +@@ -1273,14 +1276,15 @@ static int usb_resume_both(struct usb_de /* Propagate the resume up the tree, if necessary */ if (udev->state == USB_STATE_SUSPENDED) { @@ -177,7 +177,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (status || udev->state == USB_STATE_NOTATTACHED) { usb_autosuspend_device(parent); -@@ -1301,15 +1305,16 @@ static int usb_resume_both(struct usb_de +@@ -1303,15 +1307,16 @@ static int usb_resume_both(struct usb_de /* We can't progagate beyond the USB subsystem, * so if a root hub's controller is suspended * then we're stuck. */ @@ -197,7 +197,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -1337,13 +1342,13 @@ static int usb_autopm_do_device(struct u +@@ -1339,13 +1344,13 @@ static int usb_autopm_do_device(struct u udev->last_busy = jiffies; if (inc_usage_cnt >= 0 && udev->pm_usage_cnt > 0) { if (udev->state == USB_STATE_SUSPENDED) @@ -213,7 +213,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } usb_pm_unlock(udev); return status; -@@ -1467,13 +1472,14 @@ static int usb_autopm_do_interface(struc +@@ -1469,13 +1474,14 @@ static int usb_autopm_do_interface(struc udev->last_busy = jiffies; if (inc_usage_cnt >= 0 && intf->pm_usage_cnt > 0) { if (udev->state == USB_STATE_SUSPENDED) @@ -230,7 +230,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } usb_pm_unlock(udev); -@@ -1698,6 +1704,7 @@ int usb_external_suspend_device(struct u +@@ -1700,6 +1706,7 @@ int usb_external_suspend_device(struct u /** * usb_external_resume_device - external resume of a USB device and its interfaces * @udev: the usb_device to resume @@ -238,7 +238,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * * This routine handles external resume requests: ones not generated * internally by a USB driver (autoresume) but rather coming from the user -@@ -1706,13 +1713,13 @@ int usb_external_suspend_device(struct u +@@ -1708,13 +1715,13 @@ int usb_external_suspend_device(struct u * * The caller must hold @udev's device lock. */ @@ -254,7 +254,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> udev->last_busy = jiffies; usb_pm_unlock(udev); if (status == 0) -@@ -1725,7 +1732,7 @@ int usb_external_resume_device(struct us +@@ -1727,7 +1734,7 @@ int usb_external_resume_device(struct us return status; } @@ -263,7 +263,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct usb_device *udev; -@@ -1744,10 +1751,10 @@ int usb_suspend(struct device *dev, pm_m +@@ -1746,10 +1753,10 @@ int usb_suspend(struct device *dev, pm_m } udev->skip_sys_resume = 0; @@ -276,7 +276,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct usb_device *udev; -@@ -1759,7 +1766,7 @@ int usb_resume(struct device *dev) +@@ -1761,7 +1768,7 @@ int usb_resume(struct device *dev) */ if (udev->skip_sys_resume) return 0; diff --git a/usb/usb-fix-comment-about-endianness-of-descriptors.patch b/usb/usb-fix-comment-about-endianness-of-descriptors.patch deleted file mode 100644 index 9c9bfb37bbabe0..00000000000000 --- a/usb/usb-fix-comment-about-endianness-of-descriptors.patch +++ /dev/null @@ -1,57 +0,0 @@ -From stern@rowland.harvard.edu Tue Dec 9 20:44:35 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Mon, 1 Dec 2008 10:22:33 -0500 (EST) -Subject: USB: fix comment about endianness of descriptors -To: Greg KH <greg@kroah.com>, Phil Endecott <phil_twuce_endecott@chezphil.org> -Message-ID: <Pine.LNX.4.44L0.0812011021100.2212-100000@iolanthe.rowland.org> - - -From: Phil Endecott <usb_endian_patch@chezphil.org> - -This patch fixes a comment and clarifies the documentation about the -endianness of descriptors. The current policy is that descriptors will -be little-endian at the API even on big-endian systems; however the -/proc/bus/usb API predates this policy and presents descriptors with -some multibyte fields byte-swapped. - -Signed-off-by: Phil Endecott <usb_endian_patch@chezphil.org> -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/usb/proc_usb_info.txt | 6 ++++-- - include/linux/usb/ch9.h | 8 ++++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - ---- a/Documentation/usb/proc_usb_info.txt -+++ b/Documentation/usb/proc_usb_info.txt -@@ -49,8 +49,10 @@ it and 002/048 sometime later. - - These files can be read as binary data. The binary data consists - of first the device descriptor, then the descriptors for each --configuration of the device. That information is also shown in --text form by the /proc/bus/usb/devices file, described later. -+configuration of the device. Multi-byte fields in the device and -+configuration descriptors, but not other descriptors, are converted -+to host endianness by the kernel. This information is also shown -+in text form by the /proc/bus/usb/devices file, described later. - - These files may also be used to write user-level drivers for the USB - devices. You would open the /proc/bus/usb/BBB/DDD file read/write, ---- a/include/linux/usb/ch9.h -+++ b/include/linux/usb/ch9.h -@@ -158,8 +158,12 @@ struct usb_ctrlrequest { - * (rarely) accepted by SET_DESCRIPTOR. - * - * Note that all multi-byte values here are encoded in little endian -- * byte order "on the wire". But when exposed through Linux-USB APIs, -- * they've been converted to cpu byte order. -+ * byte order "on the wire". Within the kernel and when exposed -+ * through the Linux-USB APIs, they are not converted to cpu byte -+ * order; it is the responsibility of the client code to do this. -+ * The single exception is when device and configuration descriptors (but -+ * not other descriptors) are read from usbfs (i.e. /proc/bus/usb/BBB/DDD); -+ * in this case the fields are converted to host endianness by the kernel. - */ - - /* diff --git a/usb/usb-introduce-usb_queue_reset-to-do-resets-from-atomic-contexts-v7.patch b/usb/usb-introduce-usb_queue_reset-to-do-resets-from-atomic-contexts-v7.patch index 8ba317613d0e8f..d43389b99f829e 100644 --- a/usb/usb-introduce-usb_queue_reset-to-do-resets-from-atomic-contexts-v7.patch +++ b/usb/usb-introduce-usb_queue_reset-to-do-resets-from-atomic-contexts-v7.patch @@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Reset other interface state. * We cannot do a Set-Interface if the device is suspended or -@@ -378,8 +394,10 @@ void usb_driver_release_interface(struct +@@ -380,8 +396,10 @@ void usb_driver_release_interface(struct if (device_is_registered(dev)) { iface->condition = USB_INTERFACE_UNBINDING; device_release_driver(dev); @@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dev->driver = NULL; usb_set_intfdata(iface, NULL); -@@ -940,7 +958,8 @@ static int usb_suspend_interface(struct +@@ -942,7 +960,8 @@ static int usb_suspend_interface(struct if (udev->state == USB_STATE_NOTATTACHED || !is_active(intf)) goto done; diff --git a/usb/usb-pl2303-add-id-for-hewlett-packard-ld220-hp-pos-pole-display.patch b/usb/usb-pl2303-add-id-for-hewlett-packard-ld220-hp-pos-pole-display.patch deleted file mode 100644 index cec9e8897f041f..00000000000000 --- a/usb/usb-pl2303-add-id-for-hewlett-packard-ld220-hp-pos-pole-display.patch +++ /dev/null @@ -1,42 +0,0 @@ -From mike.provencher@hp.com Tue Dec 16 13:58:52 2008 -From: Mike Provencher <mike.provencher@hp.com> -Date: Tue, 16 Dec 2008 14:30:14 -0600 -Subject: USB: pl2303: add id for Hewlett-Packard LD220-HP POS pole display -To: greg@kroah.com -Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org -Message-ID: <1229459414.4871.91.camel@localhost> - - -Add id for the Hewlett-Packard LD220-HP POS pole display. - -Bus 002 Device 002: ID 03f0:3524 Hewlett-Packard - -Signed-off-by: Mike Provencher <mike.provencher@hp.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/serial/pl2303.c | 1 + - drivers/usb/serial/pl2303.h | 4 ++++ - 2 files changed, 5 insertions(+) - ---- a/drivers/usb/serial/pl2303.c -+++ b/drivers/usb/serial/pl2303.c -@@ -92,6 +92,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(COREGA_VENDOR_ID, COREGA_PRODUCT_ID) }, - { USB_DEVICE(YCCABLE_VENDOR_ID, YCCABLE_PRODUCT_ID) }, - { USB_DEVICE(SUPERIAL_VENDOR_ID, SUPERIAL_PRODUCT_ID) }, -+ { USB_DEVICE(HP_VENDOR_ID, HP_LD220_PRODUCT_ID) }, - { } /* Terminating entry */ - }; - ---- a/drivers/usb/serial/pl2303.h -+++ b/drivers/usb/serial/pl2303.h -@@ -114,3 +114,7 @@ - /* "Superial" USB - Serial */ - #define SUPERIAL_VENDOR_ID 0x5372 - #define SUPERIAL_PRODUCT_ID 0x2303 -+ -+/* Hewlett-Packard LD220-HP POS Pole Display */ -+#define HP_VENDOR_ID 0x03f0 -+#define HP_LD220_PRODUCT_ID 0x3524 diff --git a/usb/usb-set-correct-configuration-in-probe-of-ti_usb_3410_5052.patch b/usb/usb-set-correct-configuration-in-probe-of-ti_usb_3410_5052.patch deleted file mode 100644 index a288f0bc835fa8..00000000000000 --- a/usb/usb-set-correct-configuration-in-probe-of-ti_usb_3410_5052.patch +++ /dev/null @@ -1,91 +0,0 @@ -From oliver@neukum.org Tue Dec 16 13:58:38 2008 -From: Oliver Neukum <oliver@neukum.org> -Date: Tue, 16 Dec 2008 12:25:55 +0100 -Subject: USB: set correct configuration in probe of ti_usb_3410_5052 -To: "Greg Kroah-Hartman" <gregkh@suse.de>, linux-usb@vger.kernel.org, Al Borchers <alborchers@steinerpoint.com>, Peter Berger <pberger@brimson.com> -Message-ID: <200812161225.57682.oliver@neukum.org> -Content-Disposition: inline - - -This driver transfers firmware. It may just as well set the correct -configuration. - -Signed-off-by: Oliver Neukum <oneukum@suse.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ti_usb_3410_5052.c | 55 +--------------------------------- - 1 file changed, 3 insertions(+), 52 deletions(-) - ---- a/drivers/usb/serial/ti_usb_3410_5052.c -+++ b/drivers/usb/serial/ti_usb_3410_5052.c -@@ -16,56 +16,6 @@ - * For questions or problems with this driver, contact Texas Instruments - * technical support, or Al Borchers <alborchers@steinerpoint.com>, or - * Peter Berger <pberger@brimson.com>. -- * -- * This driver needs this hotplug script in /etc/hotplug/usb/ti_usb_3410_5052 -- * or in /etc/hotplug.d/usb/ti_usb_3410_5052.hotplug to set the device -- * configuration. -- * -- * #!/bin/bash -- * -- * BOOT_CONFIG=1 -- * ACTIVE_CONFIG=2 -- * -- * if [[ "$ACTION" != "add" ]] -- * then -- * exit -- * fi -- * -- * CONFIG_PATH=/sys${DEVPATH%/?*}/bConfigurationValue -- * -- * if [[ 0`cat $CONFIG_PATH` -ne $BOOT_CONFIG ]] -- * then -- * exit -- * fi -- * -- * PRODUCT=${PRODUCT%/?*} # delete version -- * VENDOR_ID=`printf "%d" 0x${PRODUCT%/?*}` -- * PRODUCT_ID=`printf "%d" 0x${PRODUCT#*?/}` -- * -- * PARAM_PATH=/sys/module/ti_usb_3410_5052/parameters -- * -- * function scan() { -- * s=$1 -- * shift -- * for i -- * do -- * if [[ $s -eq $i ]] -- * then -- * return 0 -- * fi -- * done -- * return 1 -- * } -- * -- * IFS=$IFS, -- * -- * if (scan $VENDOR_ID 1105 `cat $PARAM_PATH/vendor_3410` && -- * scan $PRODUCT_ID 13328 `cat $PARAM_PATH/product_3410`) || -- * (scan $VENDOR_ID 1105 `cat $PARAM_PATH/vendor_5052` && -- * scan $PRODUCT_ID 20562 20818 20570 20575 `cat $PARAM_PATH/product_5052`) -- * then -- * echo $ACTIVE_CONFIG > $CONFIG_PATH -- * fi - */ - - #include <linux/kernel.h> -@@ -457,9 +407,10 @@ static int ti_startup(struct usb_serial - goto free_tdev; - } - -- /* the second configuration must be set (in sysfs by hotplug script) */ -+ /* the second configuration must be set */ - if (dev->actconfig->desc.bConfigurationValue == TI_BOOT_CONFIG) { -- status = -ENODEV; -+ status = usb_driver_set_configuration(dev, TI_ACTIVE_CONFIG); -+ status = status ? status : -ENODEV; - goto free_tdev; - } - diff --git a/usb/usb-skip-set-interface-if-already-in-altsetting-0.patch b/usb/usb-skip-set-interface-if-already-in-altsetting-0.patch deleted file mode 100644 index 78facf534fa673..00000000000000 --- a/usb/usb-skip-set-interface-if-already-in-altsetting-0.patch +++ /dev/null @@ -1,37 +0,0 @@ -From stern@rowland.harvard.edu Tue Dec 16 13:44:38 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Mon, 1 Dec 2008 10:24:41 -0500 (EST) -Subject: USB: skip Set-Interface(0) if already in altsetting 0 -To: Greg KH <greg@kroah.com> -Message-ID: <Pine.LNX.4.44L0.0812011023480.2212-100000@iolanthe.rowland.org> - - -When a driver unbinds from an interface, usbcore always sends a -Set-Interface request to reinstall altsetting 0. Unforunately, quite -a few devices have buggy firmware that crashes when it receives this -request. - -To avoid such problems, this patch (as1180) arranges to send the -Set-Interface request only when the interface is not already in -altsetting 0. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/driver.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/core/driver.c -+++ b/drivers/usb/core/driver.c -@@ -295,7 +295,9 @@ static int usb_unbind_interface(struct d - * altsetting means creating new endpoint device entries). - * When either of these happens, defer the Set-Interface. - */ -- if (!error && intf->dev.power.status == DPM_ON) -+ if (intf->cur_altsetting->desc.bAlternateSetting == 0) -+ ; /* Already in altsetting 0 so skip Set-Interface */ -+ else if (!error && intf->dev.power.status == DPM_ON) - usb_set_interface(udev, intf->altsetting[0]. - desc.bInterfaceNumber, 0); - else diff --git a/usb/usb-utilize-round_jiffies_up_relative.patch b/usb/usb-utilize-round_jiffies_up_relative.patch index 61221ecf4bfba7..ff5aa76e5766cc 100644 --- a/usb/usb-utilize-round_jiffies_up_relative.patch +++ b/usb/usb-utilize-round_jiffies_up_relative.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c -@@ -1109,7 +1109,7 @@ static int autosuspend_check(struct usb_ +@@ -1111,7 +1111,7 @@ static int autosuspend_check(struct usb_ if (reschedule) { if (!timer_pending(&udev->autosuspend.timer)) { queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend, @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } return -EAGAIN; } -@@ -1551,7 +1551,7 @@ void usb_autopm_put_interface_async(stru +@@ -1553,7 +1553,7 @@ void usb_autopm_put_interface_async(stru else if (intf->pm_usage_cnt <= 0 && !timer_pending(&udev->autosuspend.timer)) { queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend, diff --git a/usb/usbmon-drop-bogus-0t-from-usbmon.txt.patch b/usb/usbmon-drop-bogus-0t-from-usbmon.txt.patch deleted file mode 100644 index 7a646d05b81b34..00000000000000 --- a/usb/usbmon-drop-bogus-0t-from-usbmon.txt.patch +++ /dev/null @@ -1,49 +0,0 @@ -From zaitcev@redhat.com Tue Dec 9 20:36:35 2008 -From: Pete Zaitcev <zaitcev@redhat.com> -Date: Thu, 4 Dec 2008 16:17:00 -0700 -Subject: usbmon: drop bogus 0t from usbmon.txt -To: greg@kroah.com -Message-ID: <20081204161700.86554ddd.zaitcev@redhat.com> - -From: Pete Zaitcev <zaitcev@redhat.com> - -The example is incorrect: there is no 0t socket (the '1t' format has no -bus number in it). Also, correct the broken sentence for USB Tag. - -Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/usb/usbmon.txt | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - ---- a/Documentation/usb/usbmon.txt -+++ b/Documentation/usb/usbmon.txt -@@ -34,11 +34,12 @@ if usbmon is built into the kernel. - Verify that bus sockets are present. - - # ls /sys/kernel/debug/usbmon --0s 0t 0u 1s 1t 1u 2s 2t 2u 3s 3t 3u 4s 4t 4u -+0s 0u 1s 1t 1u 2s 2t 2u 3s 3t 3u 4s 4t 4u - # - --Now you can choose to either use the sockets numbered '0' (to capture packets on --all buses), and skip to step #3, or find the bus used by your device with step #2. -+Now you can choose to either use the socket '0u' (to capture packets on all -+buses), and skip to step #3, or find the bus used by your device with step #2. -+This allows to filter away annoying devices that talk continuously. - - 2. Find which bus connects to the desired device - -@@ -99,8 +100,9 @@ on the event type, but there is a set of - - Here is the list of words, from left to right: - --- URB Tag. This is used to identify URBs is normally a kernel mode address -- of the URB structure in hexadecimal. -+- URB Tag. This is used to identify URBs, and is normally an in-kernel address -+ of the URB structure in hexadecimal, but can be a sequence number or any -+ other unique string, within reason. - - - Timestamp in microseconds, a decimal number. The timestamp's resolution - depends on available clock, and so it can be much worse than a microsecond @@ -1 +1 @@ -2.6.28-rc8 +2.6.28-rc8-git6 |