-From ebiederm@xmission.com Wed Jul 21 13:33:47 2010

-To: Greg KH <gregkh@suse.de>

-Cc: Andrew Morton <akpm@linux-foundation.org>, Greg KH <greg@kroah.com>,

- "Rafael J. Wysocki" <rjw@sisk.pl>,

- "Maciej W. Rozycki" <macro@linux-mips.org>,

- Kay Sievers <kay.sievers@vrfy.org>,

- Johannes Berg <johannes@sipsolutions.net>

-Subject: sysfs: allow creating symlinks from untagged to tagged directories

-From: ebiederm@xmission.com (Eric W. Biederman)

-Date: Tue, 20 Jul 2010 22:12:01 -0700

-Message-ID: <m1r5ix4dwe.fsf_-_@fess.ebiederm.org>

-

-

-Supporting symlinks from untagged to tagged directories is reasonable,

-and needed to support CONFIG_SYSFS_DEPRECATED. So don't fail a prior

-allowing that case to work.

-

-Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- fs/sysfs/symlink.c | 3 ++-

- 1 file changed, 2 insertions(+), 1 deletion(-)

-

---- a/fs/sysfs/symlink.c

-+++ b/fs/sysfs/symlink.c

-@@ -67,7 +67,8 @@ static int sysfs_do_create_link(struct k

-

- sysfs_addrm_start(&acxt, parent_sd);

- /* Symlinks must be between directories with the same ns_type */

-- if (ns_type == sysfs_ns_type(sd->s_symlink.target_sd->s_parent)) {

-+ if (!ns_type ||

-+ (ns_type == sysfs_ns_type(sd->s_symlink.target_sd->s_parent))) {

- if (warn)

- error = sysfs_add_one(&acxt, sd);

- else

-From ebiederm@xmission.com Thu Jul 8 16:02:17 2010

-From: ebiederm@xmission.com (Eric W. Biederman)

-Date: Thu, 08 Jul 2010 09:31:24 -0700

-Subject: sysfs: Don't allow the creation of symlinks we can't remove

-To: Greg KH <gregkh@suse.de>

-Cc: Andrew Morton <akpm@linux-foundation.org>, "Rafael J. Wysocki" <rjw@sisk.pl>, "Maciej W. Rozycki" <macro@linux-mips.org>, Kay Sievers <kay.sievers@vrfy.org>, Johannes Berg <johannes@sipsolutions.net>, Greg KH <greg@kroah.com>

-Message-ID: <m1630q7x5v.fsf_-_@fess.ebiederm.org>

-

-

-Recently my tagged sysfs support revealed a flaw in the device core

-that a few rare drivers are running into such that we don't always put

-network devices in a class subdirectory named net/.

-

-Since we are not creating the class directory the network devices wind

-up in a non-tagged directory, but the symlinks to the network devices

-from /sys/class/net are in a tagged directory. All of which works

-until we go to remove or rename the symlink. When we remove or rename

-a symlink we look in the namespace of the target of the symlink.

-Since the target of the symlink is in a non-tagged sysfs directory we

-don't have a namespace to look in, and we fail to remove the symlink.

-

-Detect this problem up front and simply don't create symlinks we won't

-be able to remove later. This prevents symlink leakage and fails in

-a much clearer and more understandable way.

-

-Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

-Cc: Andrew Morton <akpm@linux-foundation.org>

-Cc: Rafael J. Wysocki <rjw@sisk.pl>

-Cc: Maciej W. Rozycki <macro@linux-mips.org>

-Cc: Kay Sievers <kay.sievers@vrfy.org>

-Cc: Johannes Berg <johannes@sipsolutions.net>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- fs/sysfs/symlink.c | 23 ++++++++++++++++++-----

- 1 file changed, 18 insertions(+), 5 deletions(-)

-

---- a/fs/sysfs/symlink.c

-+++ b/fs/sysfs/symlink.c

-@@ -28,6 +28,7 @@ static int sysfs_do_create_link(struct k

- struct sysfs_dirent *target_sd = NULL;

- struct sysfs_dirent *sd = NULL;

- struct sysfs_addrm_cxt acxt;

-+ enum kobj_ns_type ns_type;

- int error;

-

- BUG_ON(!name);

-@@ -58,16 +59,28 @@ static int sysfs_do_create_link(struct k

- if (!sd)

- goto out_put;

-

-- if (sysfs_ns_type(parent_sd))

-+ ns_type = sysfs_ns_type(parent_sd);

-+ if (ns_type)

- sd->s_ns = target->ktype->namespace(target);

- sd->s_symlink.target_sd = target_sd;

- target_sd = NULL; /* reference is now owned by the symlink */

-

- sysfs_addrm_start(&acxt, parent_sd);

-- if (warn)

-- error = sysfs_add_one(&acxt, sd);

-- else

-- error = __sysfs_add_one(&acxt, sd);

-+ /* Symlinks must be between directories with the same ns_type */

-+ if (ns_type == sysfs_ns_type(sd->s_symlink.target_sd->s_parent)) {

-+ if (warn)

-+ error = sysfs_add_one(&acxt, sd);

-+ else

-+ error = __sysfs_add_one(&acxt, sd);

-+ } else {

-+ error = -EINVAL;

-+ WARN(1, KERN_WARNING

-+ "sysfs: symlink across ns_types %s/%s -> %s/%s\n",

-+ parent_sd->s_name,

-+ sd->s_name,

-+ sd->s_symlink.target_sd->s_parent->s_name,

-+ sd->s_symlink.target_sd->s_name);

-+ }

- sysfs_addrm_finish(&acxt);

-

- if (error)

-From ebiederm@xmission.com Wed Jul 21 13:33:29 2010

-To: Greg KH <gregkh@suse.de>

-Cc: Andrew Morton <akpm@linux-foundation.org>, Greg KH <greg@kroah.com>,

- "Rafael J. Wysocki" <rjw@sisk.pl>,

- "Maciej W. Rozycki" <macro@linux-mips.org>,

- Kay Sievers <kay.sievers@vrfy.org>,

- Johannes Berg <johannes@sipsolutions.net>

-Subject: sysfs: sysfs_delete_link handle symlinks from untagged to tagged directories.

-From: ebiederm@xmission.com (Eric W. Biederman)

-Date: Tue, 20 Jul 2010 22:10:58 -0700

-Message-ID: <m1vd894dy5.fsf_-_@fess.ebiederm.org>

-

-

-This happens for network devices when SYSFS_DEPRECATED is enabled.

-

-Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- fs/sysfs/symlink.c | 2 +-

- 1 file changed, 1 insertion(+), 1 deletion(-)

-

---- a/fs/sysfs/symlink.c

-+++ b/fs/sysfs/symlink.c

-@@ -135,7 +135,7 @@ void sysfs_delete_link(struct kobject *k

- {

- const void *ns = NULL;

- spin_lock(&sysfs_assoc_lock);

-- if (targ->sd)

-+ if (targ->sd && sysfs_ns_type(kobj->sd))

- ns = targ->sd->s_ns;

- spin_unlock(&sysfs_assoc_lock);

- sysfs_hash_and_remove(kobj->sd, ns, name);

-driver-core.current/sysfs-don-t-allow-the-creation-of-symlinks-we-can-t-remove.patch

-driver-core.current/sysfs-sysfs_delete_link-handle-symlinks-from-untagged-to-tagged-directories.patch

-driver-core.current/sysfs-allow-creating-symlinks-from-untagged-to-tagged-directories.patch

-tty.current/serial-fix-rs485-for-atmel_serial-on-avr32.patch

-usb.current/usb-option-add-support-for-1da5-4518.patch

-usb.current/usb-add-pid-for-sierra-250u-to-drivers-usb-serial-sierra.c.patch

-usb.current/usb-expose-vendor-specific-acm-channel-on-nokia-5230.patch

-usb.current/usb-s3c2410_udc-be-aware-of-connected-gadget-driver.patch

-usb.current/usb-ftdi_sio-support-for-signalyzer-tools-based-on-ftdi-chips.patch

-usb.current/usb-new-pids-for-qualcomm-gobi-2000-qcserial.patch

-usb.current/usb-option-add-support-for-amoi-skypephone-s2.patch

-usb.current/usb-xhci-fix-another-bug-in-link-trb-activation-change.patch

-usb.current/usb-fix-usb3.0-port-speed-downgrade-after-port-reset.patch

-usb.current/usb-xhci-set-ep0-dequeue-ptr-after-reset-of-configured-device.patch

-usb.current/usb-adds-artisman-usb-dongle-to-list-of-quirky-devices.patch

-usb.current/usb-sisusbvga-fix-for-usb-3.0.patch

-usb.current/usb-xhci-set-mult-field-in-endpoint-context-correctly.patch

-usb.current/usb-usb-storage-fix-initializations-of-urb-fields.patch

-usb.current/usb-add-quirk-for-broadcom-bt-dongle.patch

-usb.current/usb-ftdi-add-support-for-the-rt-system-vx-7-radio-programming-cable.patch

-usb.current/usb-musb-tusb6010-fix-compile-error-with-n8x0_defconfig.patch

-usb/usb-pxa-fix-incorrect-config_cpu_pxa27x-to-config_pxa27x.patch

-From PeterHuewe@gmx.de Thu Jul 8 08:54:58 2010

-From: Peter H�we <PeterHuewe@gmx.de>

-Date: Tue, 29 Jun 2010 19:35:39 +0200

-Subject: serial: fix rs485 for atmel_serial on avr32

-To: Haavard Skinnemoen <hskinnemoen@atmel.com>, Claudio Scordino <claudio@evidence.eu.com>

-Cc: "Greg Kroah-Hartman" <gregkh@suse.de>, Howard Chu <hyc@symas.com>, Peter Ma <pma@mediamatech.com>, Andrew Morton <akpm@linux-foundation.org>, Albin Tonnerre <albin.tonnerre@free-electrons.com>, Alan Cox <alan@linux.intel.com>, Stephen Rothwell <sfr@canb.auug.org.au>, Sebastian Heutling <Sebastian.Heutling@who-ing.de>, Bernhard Roth <br@pwrnet.de>, Ryan Mallon <ryan@bluewatersys.com>, Michael Trimarchi <michael@evidence.eu.com>, Rick Bronson <rick@efn.org>, Sebastian Heutling <Sebastian.Heutling@who-ing.de>, Russell King <rmk+kernel@arm.linux.org.uk>, kernel@avr32linux.org, linux-arm-kernel@lists.infradead.org

-Message-ID: <201006291935.40229.PeterHuewe@gmx.de>

-

-

-From: Peter Huewe <peterhuewe@gmx.de>

-

-This patch fixes a build failure [1-4] in the atmel_serial code introduced by

-patch the patch ARM: 6092/1: atmel_serial: support for RS485

-communications (e8faff7330a3501eafc9bfe5f4f15af444be29f5)

-

-The build failure was caused by missing struct field and missing defines

-for the avr32 board - the patch fixes this.

-

-[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2575242/ - first failure in linux-next, may 11th

-[2] http://kisskb.ellerman.id.au/kisskb/buildresult/2816418/ - still exists as of today

-[3] http://kisskb.ellerman.id.au/kisskb/buildresult/2617511/ - first failure in Linus' tree - May 20th - did really no one notice this?!

-[4] http://kisskb.ellerman.id.au/kisskb/buildresult/2813956/ - still exists in Linus' tree as of today

-

-Signed-off-by: Peter Huewe <peterhuewe@gmx.de>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- arch/avr32/include/asm/ioctls.h | 3 +++

- arch/avr32/mach-at32ap/include/mach/board.h | 2 ++

- drivers/serial/atmel_serial.c | 1 +

- 3 files changed, 6 insertions(+)

-

---- a/arch/avr32/include/asm/ioctls.h

-+++ b/arch/avr32/include/asm/ioctls.h

-@@ -54,6 +54,9 @@

- #define TIOCGPTN _IOR('T',0x30, unsigned int) /* Get Pty Number (of pty-mux device) */

- #define TIOCSPTLCK _IOW('T',0x31, int) /* Lock/unlock Pty */

-

-+#define TIOCGRS485 0x542E

-+#define TIOCSRS485 0x542F

-+

- #define FIONCLEX 0x5450

- #define FIOCLEX 0x5451

- #define FIOASYNC 0x5452

---- a/arch/avr32/mach-at32ap/include/mach/board.h

-+++ b/arch/avr32/mach-at32ap/include/mach/board.h

-@@ -5,6 +5,7 @@

- #define __ASM_ARCH_BOARD_H

-

- #include <linux/types.h>

-+#include <linux/serial.h>

-

- #define GPIO_PIN_NONE (-1)

-

-@@ -35,6 +36,7 @@ struct atmel_uart_data {

- short use_dma_tx; /* use transmit DMA? */

- short use_dma_rx; /* use receive DMA? */

- void __iomem *regs; /* virtual base address, if any */

-+ struct serial_rs485 rs485; /* rs485 settings */

- };

- void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);

- struct platform_device *at32_add_device_usart(unsigned int id);

---- a/drivers/serial/atmel_serial.c

-+++ b/drivers/serial/atmel_serial.c

-@@ -41,6 +41,7 @@

- #include <linux/uaccess.h>

-

- #include <asm/io.h>

-+#include <asm/ioctls.h>

-

- #include <asm/mach/serial_at91.h>

- #include <mach/board.h>

-From gus@pbx.org Thu Jul 8 08:51:10 2010

-From: august huber <gus@pbx.org>

-Date: Mon, 28 Jun 2010 11:46:05 -0700

-Subject: USB: Add PID for Sierra 250U to drivers/usb/serial/sierra.c

-To: gregkh@suse.de

-Message-ID: <AANLkTilhVcuqVPUiPoBtuhEoFM4IgQq1HZpYqIndzOhT@mail.gmail.com>

-

-

-Add VID/PID for Sierra Wireless 250U USB dongle to sierra.c

-Allows use of 3G radio only

-

-Signed-off-by: August Huber <gus@pbx.org>

-Cc: Elina Pasheva <epasheva@sierrawireless.com>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/serial/sierra.c | 1 +

- 1 file changed, 1 insertion(+)

-

---- a/drivers/usb/serial/sierra.c

-+++ b/drivers/usb/serial/sierra.c

-@@ -245,6 +245,7 @@ static const struct usb_device_id id_tab

- { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */

- { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */

- { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U */

-+ { USB_DEVICE(0x1199, 0x0301) }, /* Sierra Wireless USB Dongle 250U */

- /* Sierra Wireless C597 */

- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) },

- /* Sierra Wireless T598 */

-From oliver@neukum.org Wed Jul 21 12:59:11 2010

-From: Oliver Neukum <oliver@neukum.org>

-To: "Greg Kroah-Hartman" <gregkh@suse.de>

-Subject: USB: add quirk for Broadcom BT dongle

-Date: Wed, 14 Jul 2010 18:26:22 +0200

-Cc: linux-usb@vger.kernel.org, stable@kernel.org

-Message-Id: <201007141826.23016.oliver@neukum.org>

-

-This device needs to be reset when resuming

-

-Signed-off-by: Oliver Neukum <oneukum@suse.de>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/core/quirks.c | 3 +++

- 1 file changed, 3 insertions(+)

-

---- a/drivers/usb/core/quirks.c

-+++ b/drivers/usb/core/quirks.c

-@@ -68,6 +68,9 @@ static const struct usb_device_id usb_qu

- /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */

- { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },

-

-+ /* Broadcom BCM92035DGROM BT dongle */

-+ { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },

-+

- /* Action Semiconductor flash disk */

- { USB_DEVICE(0x10d6, 0x2200), .driver_info =

- USB_QUIRK_STRING_FETCH_255 },

-From mortier@btinternet.com Fri Jul 9 14:33:39 2010

-From: Paul Mortier <mortier@btinternet.com>

-Date: Fri, 09 Jul 2010 13:18:50 +0100

-Subject: USB: adds Artisman USB dongle to list of quirky devices

-To: linux-usb@vger.kernel.org

-Cc: gregkh@suse.de

-Message-ID: <4C3713AA.3010008@btinternet.com>

-

-

-From: Paul Mortier <mortier@btinternet.com>

-

-When an attempt is made to read the interface strings of the Artisman

-Watchdog USB dongle (idVendor:idProduct 04b4:0526) an error is written

-to the dmesg log (uhci_result_common: failed with status 440000) and the

-dongle resets itself, resulting in a disconnect/reconnect loop.

-

-Adding the dongle to the list of devices in quirks.c, with the same

-quirk Alan Stern's previous patch for the Saitek Cyborg Gold 3D

-joystick, stops the device from resetting and allows it to be used with

-no problems.

-

-Signed-off-by: Paul Mortier <mortier@btinternet.com>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/core/quirks.c | 4 ++++

- 1 file changed, 4 insertions(+)

-

---- a/drivers/usb/core/quirks.c

-+++ b/drivers/usb/core/quirks.c

-@@ -41,6 +41,10 @@ static const struct usb_device_id usb_qu

- /* Philips PSC805 audio device */

- { USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },

-

-+ /* Artisman Watchdog Dongle */

-+ { USB_DEVICE(0x04b4, 0x0526), .driver_info =

-+ USB_QUIRK_CONFIG_INTF_STRINGS },

-+

- /* Roland SC-8820 */

- { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME },

-

-From przemo@firszt.eu Thu Jul 8 08:53:20 2010

-From: Przemo Firszt <przemo@firszt.eu>

-Date: Mon, 28 Jun 2010 21:29:34 +0100

-Subject: USB: Expose vendor-specific ACM channel on Nokia 5230

-To: oliver@neukum.name, gregkh@suse.de, alan@linux.intel.com, francescolavra@interfree.it, julian.calaby@gmail.com

-Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Przemo Firszt <przemo@firszt.eu>

-Message-ID: <1277756974-3373-1-git-send-email-przemo@firszt.eu>

-

-

-Nokia S60 phones expose two ACM channels. The first is

-a modem, the second is 'vendor-specific' but is treated

-as a serial device at the S60 end, so we want to expose

-it on Linux too.

-

-Signed-off-by: Przemo Firszt <przemo@firszt.eu>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/class/cdc-acm.c | 1 +

- 1 file changed, 1 insertion(+)

-

---- a/drivers/usb/class/cdc-acm.c

-+++ b/drivers/usb/class/cdc-acm.c

-@@ -1596,6 +1596,7 @@ static const struct usb_device_id acm_id

- { NOKIA_PCSUITE_ACM_INFO(0x00e9), }, /* Nokia 5320 XpressMusic */

- { NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */

- { NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */

-+ { NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */

-

- /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */

-

-From sarah.a.sharp@linux.intel.com Fri Jul 9 14:32:54 2010

-From: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-Date: Fri, 9 Jul 2010 17:08:48 +0200

-Subject: USB: Fix USB3.0 Port Speed Downgrade after port reset

-To: Greg KH <gregkh@suse.de>

-Cc: linux-usb@vger.kernel.org, Fajun Chen <fajun.chen@seagate.com>

-Message-ID: <20100709150846.GA3252@xanatos>

-Content-Disposition: inline

-

-

-Without this fix, a USB 3.0 port is downgraded to full speed after a port

-reset of a configured device. The USB 3.0 terminations will be disabled

-permanently, and USB 3.0 devices will always enumerate as full speed

-devices, until the host controller is unplugged (if it is an ExpressCard)

-or the computer is rebooted.

-

-Fajun Chen traced this traced the speed downgrade issue to the port reset

-and the interpretation of port status in USB hub driver code. The hub

-code was not testing for the port being a SuperSpeed port, and it fell

-through to the else case of Full Speed.

-

-The following patch adds SuperSpeed mapping from the port status, and

-fixes the speed downgrade issue.

-

-Reported-by: Fajun Chen <fajun.chen@seagate.com>

-Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/core/hub.c | 2 ++

- 1 file changed, 2 insertions(+)

-

---- a/drivers/usb/core/hub.c

-+++ b/drivers/usb/core/hub.c

-@@ -1982,6 +1982,8 @@ static int hub_port_wait_reset(struct us

- (portstatus & USB_PORT_STAT_ENABLE)) {

- if (hub_is_wusb(hub))

- udev->speed = USB_SPEED_WIRELESS;

-+ else if (portstatus & USB_PORT_STAT_SUPER_SPEED)

-+ udev->speed = USB_SPEED_SUPER;

- else if (portstatus & USB_PORT_STAT_HIGH_SPEED)

- udev->speed = USB_SPEED_HIGH;

- else if (portstatus & USB_PORT_STAT_LOW_SPEED)

-From linux-usb-owner@vger.kernel.org Wed Jul 21 13:02:45 2010

-Date: Wed, 21 Jul 2010 08:39:22 -0500

-From: Corey Minyard <minyard@acm.org>

-To: linux-usb@vger.kernel.org

-Subject: USB: FTDI: Add support for the RT System VX-7 radio programming cable

-Message-id: <20100721133922.GC9725@mail.minyard.local>

-Content-disposition: inline

-

-From: Corey Minyard <minyard@acm.org>

-

-RT Systems has put out bunch of ham radio cables based on the FT232RL

-chip. Each cable type has a unique PID, this adds one for the Yaesu VX-7

-radios.

-

-Signed-off-by: Corey Minyard <minyard@acm.org>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/serial/ftdi_sio.c | 1 +

- drivers/usb/serial/ftdi_sio_ids.h | 6 ++++++

- 2 files changed, 7 insertions(+)

-

---- a/drivers/usb/serial/ftdi_sio.c

-+++ b/drivers/usb/serial/ftdi_sio.c

-@@ -691,6 +691,7 @@ static struct usb_device_id id_table_com

- { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID),

- .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk },

- { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },

-+ { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_SERIAL_VX7_PID) },

- { USB_DEVICE(FTDI_VID, FTDI_MAXSTREAM_PID) },

- { USB_DEVICE(FTDI_VID, FTDI_PHI_FISCO_PID) },

- { USB_DEVICE(TML_VID, TML_USB_SERIAL_PID) },

---- a/drivers/usb/serial/ftdi_sio_ids.h

-+++ b/drivers/usb/serial/ftdi_sio_ids.h

-@@ -696,6 +696,12 @@

- #define TELLDUS_TELLSTICK_PID 0x0C30 /* RF control dongle 433 MHz using FT232RL */

-

- /*

-+ * RT Systems programming cables for various ham radios

-+ */

-+#define RTSYSTEMS_VID 0x2100 /* Vendor ID */

-+#define RTSYSTEMS_SERIAL_VX7_PID 0x9e52 /* Serial converter for VX-7 Radios using FT232RL */

-+

-+/*

- * Bayer Ascensia Contour blood glucose meter USB-converter cable.

- * http://winglucofacts.com/cables/

- */

-From colin.leitner@googlemail.com Thu Jul 8 08:56:30 2010

-From: Colin Leitner <colin.leitner@googlemail.com>

-Date: Thu, 01 Jul 2010 10:49:55 +0200

-Subject: USB: ftdi_sio: support for Signalyzer tools based on FTDI chips

-To: greg@kroah.com

-Cc: jhovold@gmail.com

-Message-ID: <1277974195.4483.2.camel@schleppi2>

-

-

-ftdi_sio: support for Signalyzer tools based on FTDI chips

-

-This patch adds support for the Xverve Signalyzers.

-

-Signed-off-by: Colin Leitner <colin.leitner@googlemail.com>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/serial/ftdi_sio.c | 8 ++++++++

- drivers/usb/serial/ftdi_sio_ids.h | 9 +++++++++

- 2 files changed, 17 insertions(+)

-

---- a/drivers/usb/serial/ftdi_sio.c

-+++ b/drivers/usb/serial/ftdi_sio.c

-@@ -737,6 +737,14 @@ static struct usb_device_id id_table_com

- { USB_DEVICE(FTDI_VID, MJSG_SR_RADIO_PID) },

- { USB_DEVICE(FTDI_VID, MJSG_HD_RADIO_PID) },

- { USB_DEVICE(FTDI_VID, MJSG_XM_RADIO_PID) },

-+ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_ST_PID),

-+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

-+ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SLITE_PID),

-+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

-+ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH2_PID),

-+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

-+ { USB_DEVICE(FTDI_VID, XVERVE_SIGNALYZER_SH4_PID),

-+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },

- { }, /* Optional parameter entry */

- { } /* Terminating entry */

- };

---- a/drivers/usb/serial/ftdi_sio_ids.h

-+++ b/drivers/usb/serial/ftdi_sio_ids.h

-@@ -1017,3 +1017,12 @@

- #define MJSG_SR_RADIO_PID 0x9379

- #define MJSG_XM_RADIO_PID 0x937A

- #define MJSG_HD_RADIO_PID 0x937C

-+

-+/*

-+ * Xverve Signalyzer tools (http://www.signalyzer.com/)

-+ */

-+#define XVERVE_SIGNALYZER_ST_PID 0xBCA0

-+#define XVERVE_SIGNALYZER_SLITE_PID 0xBCA1

-+#define XVERVE_SIGNALYZER_SH2_PID 0xBCA2

-+#define XVERVE_SIGNALYZER_SH4_PID 0xBCA4

-+

-From felipe.balbi@nokia.com Wed Jul 7 15:01:53 2010

-From: felipe.balbi@nokia.com

-Date: Mon, 5 Jul 2010 12:12:01 +0300

-Subject: USB: musb: tusb6010: fix compile error with n8x0_defconfig

-To: Greg KH <greg@kroah.com>

-Cc: Tony Lindgren <tony@atomide.com>, Felipe Balbi <felipe.balbi@nokia.com>

-Message-ID: <1278321121-13474-1-git-send-email-felipe.balbi@nokia.com>

-

-

-From: Felipe Balbi <felipe.balbi@nokia.com>

-

-Drop the unnecessary empty stubs in tusb6010.c and avoid

-a compile error when building kernel for n8x0.

-

-Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/musb/tusb6010.c | 13 -------------

- 1 file changed, 13 deletions(-)

-

---- a/drivers/usb/musb/tusb6010.c

-+++ b/drivers/usb/musb/tusb6010.c

-@@ -29,19 +29,6 @@ static void tusb_source_power(struct mus

- #define TUSB_REV_MAJOR(reg_val) ((reg_val >> 4) & 0xf)

- #define TUSB_REV_MINOR(reg_val) (reg_val & 0xf)

-

--#ifdef CONFIG_PM

--/* REVISIT: These should be only needed if somebody implements off idle */

--void musb_platform_save_context(struct musb *musb,

-- struct musb_context_registers *musb_context)

--{

--}

--

--void musb_platform_restore_context(struct musb *musb,

-- struct musb_context_registers *musb_context)

--{

--}

--#endif

--

- /*

- * Checks the revision. We need to use the DMA register as 3.0 does not

- * have correct versions for TUSB_PRCM_REV or TUSB_INT_CTRL_REV.

-From ajb@spheresystems.co.uk Thu Jul 8 08:57:02 2010

-From: Andrew Bird <ajb@spheresytems.co.uk>

-Date: Thu, 1 Jul 2010 20:50:07 +0100

-Subject: USB: New PIDs for Qualcomm gobi 2000 (qcserial)

-To: gregkh@suse.de

-Message-ID: <201007012050.08881.ajb@spheresystems.co.uk>

-

-

-Adds support for the Generic Qualcomm Gobi 2000 WWAN UMTS/CDMA modem

-

-Signed-off-by: Andrew Bird <ajb@spheresytems.co.uk>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/serial/qcserial.c | 2 ++

- 1 file changed, 2 insertions(+)

-

---- a/drivers/usb/serial/qcserial.c

-+++ b/drivers/usb/serial/qcserial.c

-@@ -51,6 +51,8 @@ static const struct usb_device_id id_tab

- {USB_DEVICE(0x1f45, 0x0001)}, /* Unknown Gobi QDL device */

- {USB_DEVICE(0x413c, 0x8185)}, /* Dell Gobi 2000 QDL device (N0218, VU936) */

- {USB_DEVICE(0x413c, 0x8186)}, /* Dell Gobi 2000 Modem device (N0218, VU936) */

-+ {USB_DEVICE(0x05c6, 0x9208)}, /* Generic Gobi 2000 QDL device */

-+ {USB_DEVICE(0x05c6, 0x920b)}, /* Generic Gobi 2000 Modem device */

- {USB_DEVICE(0x05c6, 0x9224)}, /* Sony Gobi 2000 QDL device (N0279, VU730) */

- {USB_DEVICE(0x05c6, 0x9225)}, /* Sony Gobi 2000 Modem device (N0279, VU730) */

- {USB_DEVICE(0x05c6, 0x9244)}, /* Samsung Gobi 2000 QDL device (VL176) */

-From omer.ugurlu@a-kent.com Thu Jul 8 08:50:04 2010

-From: �mer Sezgin Ugurlu <omer.ugurlu@a-kent.com>

-Date: Mon, 28 Jun 2010 19:01:58 +0300

-Subject: USB: option: add support for 1da5:4518

-To: Greg KH <gregkh@suse.de>

-Cc: Brad Lu <Brad.Lu@qisda.com>

-Message-ID: <AANLkTilFXmdcx-CRI8yx11Wrhqxv3hzzfy_xB69vkvwH@mail.gmail.com>

-

-

-Signed-off-by: Omer Sezgin Ugurlu <omer.ugurlu@a-kent.com>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

-

----

- drivers/usb/serial/option.c | 2 ++

- 1 file changed, 2 insertions(+)

-

---- a/drivers/usb/serial/option.c

-+++ b/drivers/usb/serial/option.c

-@@ -302,6 +302,7 @@ static void option_instat_callback(struc

- #define QISDA_PRODUCT_H21_4512 0x4512

- #define QISDA_PRODUCT_H21_4523 0x4523

- #define QISDA_PRODUCT_H20_4515 0x4515

-+#define QISDA_PRODUCT_H20_4518 0x4518

- #define QISDA_PRODUCT_H20_4519 0x4519

-

- /* TLAYTECH PRODUCTS */

-@@ -852,6 +853,7 @@ static const struct usb_device_id option

- { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4512) },

- { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H21_4523) },

- { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4515) },

-+ { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4518) },

- { USB_DEVICE(QISDA_VENDOR_ID, QISDA_PRODUCT_H20_4519) },

- { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) },

- { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */

-From d.g.jansen@googlemail.com Fri Jul 9 14:30:36 2010

-From: "Dennis Jansen" <d.g.jansen@googlemail.com>

-Date: Fri, 09 Jul 2010 22:03:53 +0200

-Subject: USB: option: Add support for AMOI Skypephone S2

-To: greg@kroah.com

-Message-ID: <op.vfld0rlf01mn9a@netbook>

-

-

-usbserial: Add AMOI Skypephone S2 support.

-

-This patch adds support for the AMOI Skypephone S2 to the usbserial module.

-

-Tested-by: Dennis Jansen <Dennis.Jansen@web.de>

-Signed-off-by: Dennis Jansen <Dennis.Jansen@web.de>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/serial/option.c | 2 ++

- 1 file changed, 2 insertions(+)

-

---- a/drivers/usb/serial/option.c

-+++ b/drivers/usb/serial/option.c

-@@ -206,6 +206,7 @@ static void option_instat_callback(struc

- #define AMOI_PRODUCT_H01 0x0800

- #define AMOI_PRODUCT_H01A 0x7002

- #define AMOI_PRODUCT_H02 0x0802

-+#define AMOI_PRODUCT_SKYPEPHONE_S2 0x0407

-

- #define DELL_VENDOR_ID 0x413C

-

-@@ -517,6 +518,7 @@ static const struct usb_device_id option

- { 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(AMOI_VENDOR_ID, AMOI_PRODUCT_SKYPEPHONE_S2) },

-

- { 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 */

-From vzapolskiy@gmail.com Thu Jul 8 08:53:54 2010

-From: Vladimir Zapolskiy <vzapolskiy@gmail.com>

-Date: Tue, 29 Jun 2010 23:36:26 +0400

-Subject: USB: s3c2410_udc: be aware of connected gadget driver

-To: linux-usb@vger.kernel.org

-Cc: Greg Kroah-Hartman <gregkh@suse.de>, Sergei Shtylyov <sshtylyov@mvista.com>, Vladimir Zapolskiy <vzapolskiy@gmail.com>

-Message-ID: <1277840186-18348-1-git-send-email-vzapolskiy@gmail.com>

-

-

-To escape from data abort in interrupt handler, it is required to

-check for a connected gadget before delivering control requests.

-

-The change fixes the following panic, which occurs with no loaded

-gadget driver and input USB_REQ_GET_DESCRIPTOR request:

-

-Kernel panic - not syncing: Fatal exception in interrupt

-[<c0025874>] (unwind_backtrace+0x0/0xd8) from [<c0253f14>] (panic+0x40/0x110)

-[<c0253f14>] (panic+0x40/0x110) from [<c002470c>] (die+0x154/0x180)

-[<c002470c>] (die+0x154/0x180) from [<c0026448>] (__do_kernel_fault+0x64/0x74)

-[<c0026448>] (__do_kernel_fault+0x64/0x74) from [<c0026610>] (do_page_fault+0x1b8/0x1cc)

-[<c0026610>] (do_page_fault+0x1b8/0x1cc) from [<c00202d4>] (do_DataAbort+0x34/0x94)

-[<c00202d4>] (do_DataAbort+0x34/0x94) from [<c0020a60>] (__dabt_svc+0x40/0x60)

-Exception stack(0xc0327ea8 to 0xc0327ef0)

-7ea0: bf0026b0 c0327ef0 c0327ee4 00000000 bf002590 00000093

-7ec0: 00000001 bf0026b0 bf002990 00000000 00000008 0000143d 00003f00 c0327ef0

-7ee0: bf001364 bf001360 20000093 ffffffff

-[<c0020a60>] (__dabt_svc+0x40/0x60) from [<bf001360>] (s3c2410_udc_irq+0x5b8/0x778 [s3c2410_udc])

-[<bf001360>] (s3c2410_udc_irq+0x5b8/0x778 [s3c2410_udc]) from [<c0058aa0>] (handle_IRQ_event+0x3c/0x104)

-[<c0058aa0>] (handle_IRQ_event+0x3c/0x104) from [<c005a428>] (handle_edge_irq+0x12c/0x164)

-[<c005a428>] (handle_edge_irq+0x12c/0x164) from [<c0020068>] (asm_do_IRQ+0x68/0x88)

-[<c0020068>] (asm_do_IRQ+0x68/0x88) from [<c0020aa4>] (__irq_svc+0x24/0xa0)

-

-Signed-off-by: Vladimir Zapolskiy <vzapolskiy@gmail.com>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/gadget/s3c2410_udc.c | 4 ++++

- 1 file changed, 4 insertions(+)

-

---- a/drivers/usb/gadget/s3c2410_udc.c

-+++ b/drivers/usb/gadget/s3c2410_udc.c

-@@ -735,6 +735,10 @@ static void s3c2410_udc_handle_ep0_idle(

- else

- dev->ep0state = EP0_OUT_DATA_PHASE;

-

-+ if (!dev->driver)

-+ return;

-+

-+ /* deliver the request to the gadget driver */

- ret = dev->driver->setup(&dev->gadget, crq);

- if (ret < 0) {

- if (dev->req_config) {

-From linux-usb-owner@vger.kernel.org Wed Jul 21 11:41:33 2010

-From: Oliver Neukum <oliver@neukum.org>

-To: Thomas Winischhofer <thomas@winischhofer.net>

-Subject: USB: sisusbvga: Fix for USB 3.0

-Date: Fri, 16 Jul 2010 17:36:26 +0200

-Cc: linux-usb@vger.kernel.org

-Message-Id: <201007161736.26601.oliver@neukum.org>

-

-From: Oliver Neukum <oliver@neukum.org>

-

-Super speed is also fast enough to let sisusbvga operate.

-Therefor expand the checks.

-

-Signed-off-by: Oliver Neukum <oneukum@suse.de>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/misc/sisusbvga/sisusb.c | 5 +++--

- 1 file changed, 3 insertions(+), 2 deletions(-)

-

---- a/drivers/usb/misc/sisusbvga/sisusb.c

-+++ b/drivers/usb/misc/sisusbvga/sisusb.c

-@@ -2436,7 +2436,8 @@ sisusb_open(struct inode *inode, struct

- }

-

- if (!sisusb->devinit) {

-- if (sisusb->sisusb_dev->speed == USB_SPEED_HIGH) {

-+ if (sisusb->sisusb_dev->speed == USB_SPEED_HIGH ||

-+ sisusb->sisusb_dev->speed == USB_SPEED_SUPER) {

- if (sisusb_init_gfxdevice(sisusb, 0)) {

- mutex_unlock(&sisusb->lock);

- dev_err(&sisusb->sisusb_dev->dev, "Failed to initialize device\n");

-@@ -3166,7 +3167,7 @@ static int sisusb_probe(struct usb_inter

-

- sisusb->present = 1;

-

-- if (dev->speed == USB_SPEED_HIGH) {

-+ if (dev->speed == USB_SPEED_HIGH || dev->speed == USB_SPEED_SUPER) {

- int initscreen = 1;

- #ifdef INCL_SISUSB_CON

- if (sisusb_first_vc > 0 &&

-From bob@bobcopeland.com Wed Jul 21 11:55:52 2010

-From: Bob Copeland <me@bobcopeland.com>

-To: stern@rowland.harvard.edu, mdharm-usb@one-eyed-alien.net,

- gregkh@suse.de

-Cc: linux-usb@vger.kernel.org, lkml@vger.kernel.org,

- Bob Copeland <me@bobcopeland.com>

-Subject: USB: usb-storage: fix initializations of urb fields

-Date: Mon, 12 Jul 2010 11:18:18 -0400

-Message-Id: <1278947898-8707-1-git-send-email-me@bobcopeland.com>

-

-Commit 0ede76fcec5415ef82a423a95120286895822e2d, "USB: remove uses of

-URB_NO_SETUP_DMA_MAP" introduced a regression by inadvertantly removing

-initialization of the transfer flags. This caused initialization

-failures in the ums-karma driver. Fix the regression by zeroing it.

-

-While at it, as Alan Stern points out, the initializers for

-actual_length and status are handled by the core and error_count

-only matters for isochronous urbs, so they don't need to be set here.

-Remove them.

-

-Signed-off-by: Bob Copeland <me@bobcopeland.com>

-Acked-by: Alan Stern <stern@rowland.harvard.edu>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/storage/transport.c | 4 +---

- 1 file changed, 1 insertion(+), 3 deletions(-)

-

---- a/drivers/usb/storage/transport.c

-+++ b/drivers/usb/storage/transport.c

-@@ -139,9 +139,7 @@ static int usb_stor_msg_common(struct us

-

- /* fill the common fields in the URB */

- us->current_urb->context = &urb_done;

-- us->current_urb->actual_length = 0;

-- us->current_urb->error_count = 0;

-- us->current_urb->status = 0;

-+ us->current_urb->transfer_flags = 0;

-

- /* we assume that if transfer_buffer isn't us->iobuf then it

- * hasn't been mapped for DMA. Yes, this is clunky, but it's

-From sarah.a.sharp@linux.intel.com Fri Jul 9 14:32:26 2010

-From: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-Date: Fri, 9 Jul 2010 17:08:38 +0200

-Subject: USB: xHCI: Fix another bug in link TRB activation change.

-To: Greg KH <gregkh@suse.de>

-Cc: linux-usb@vger.kernel.org, Fajun Chen <fajun.chen@seagate.com>

-Message-ID: <20100709150837.GA2987@xanatos>

-Content-Disposition: inline

-

-

-Commit 6c12db90f19727c76990e7f4801c67a148b30111 also seems to have

-introduced a bug that is triggered when the command ring is about to wrap.

-The inc_enq() function will not have moved the enqueue pointer past the

-link TRB. It is supposed to be moved past the link TRB in prepare_ring(),

-which should be called before a TD is enqueued. However, the

-queue_command() function never calls the prepare_ring() function because

-prepare_ring() is only supposed to be used for endpoint rings. That means

-the enqueue pointer will not be moved past the link TRB, and will get

-overwritten.

-

-The fix is to make queue_command() call prepare_ring() with a fake

-endpoint status (set to running). Then the enqueue pointer will get moved

-past the link TRB.

-

-Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/host/xhci-ring.c | 11 +++++++----

- 1 file changed, 7 insertions(+), 4 deletions(-)

-

---- a/drivers/usb/host/xhci-ring.c

-+++ b/drivers/usb/host/xhci-ring.c

-@@ -2380,16 +2380,19 @@ static int queue_command(struct xhci_hcd

- u32 field3, u32 field4, bool command_must_succeed)

- {

- int reserved_trbs = xhci->cmd_ring_reserved_trbs;

-+ int ret;

-+

- if (!command_must_succeed)

- reserved_trbs++;

-

-- if (!room_on_ring(xhci, xhci->cmd_ring, reserved_trbs)) {

-- if (!in_interrupt())

-- xhci_err(xhci, "ERR: No room for command on command ring\n");

-+ ret = prepare_ring(xhci, xhci->cmd_ring, EP_STATE_RUNNING,

-+ reserved_trbs, GFP_ATOMIC);

-+ if (ret < 0) {

-+ xhci_err(xhci, "ERR: No room for command on command ring\n");

- if (command_must_succeed)

- xhci_err(xhci, "ERR: Reserved TRB counting for "

- "unfailable commands failed.\n");

-- return -ENOMEM;

-+ return ret;

- }

- queue_trb(xhci, xhci->cmd_ring, false, false, field1, field2, field3,

- field4 | xhci->cmd_ring->cycle_state);

-From sarah.a.sharp@linux.intel.com Fri Jul 9 14:33:25 2010

-From: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-Date: Fri, 9 Jul 2010 17:08:54 +0200

-Subject: USB: xhci: Set EP0 dequeue ptr after reset of configured device.

-To: Greg KH <gregkh@suse.de>

-Cc: linux-usb@vger.kernel.org, Fajun Chen <fajun.chen@seagate.com>, stable@vger.kernel.org

-Message-ID: <20100709150854.GA3804@xanatos>

-Content-Disposition: inline

-

-

-When a configured device is reset, the control endpoint's ring is reused.

-If control transfers to the device were issued before the device is reset,

-the dequeue pointer will be somewhere in the middle of the ring. If the

-device is then issued an address with the set address command, the xHCI

-driver must provide a valid input context for control endpoint zero.

-

-The original code would give the hardware the original input context,

-which had a dequeue pointer set to the top of the ring. This would cause

-the host to re-execute any control transfers until it reached the ring's

-enqueue pointer. When issuing a set address command for a device that has

-just been configured and then reset, use the control endpoint's enqueue

-pointer as the hardware's dequeue pointer.

-

-Assumption: All control transfers will be completed or cancelled before

-the set address command is issued to the device. If there are any

-outstanding control transfers, this code will not work.

-

-Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/host/xhci-mem.c | 21 +++++++++++++++++++++

- drivers/usb/host/xhci.c | 2 ++

- drivers/usb/host/xhci.h | 2 ++

- 3 files changed, 25 insertions(+)

-

---- a/drivers/usb/host/xhci-mem.c

-+++ b/drivers/usb/host/xhci-mem.c

-@@ -835,6 +835,27 @@ fail:

- return 0;

- }

-

-+void xhci_copy_ep0_dequeue_into_input_ctx(struct xhci_hcd *xhci,

-+ struct usb_device *udev)

-+{

-+ struct xhci_virt_device *virt_dev;

-+ struct xhci_ep_ctx *ep0_ctx;

-+ struct xhci_ring *ep_ring;

-+

-+ virt_dev = xhci->devs[udev->slot_id];

-+ ep0_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, 0);

-+ ep_ring = virt_dev->eps[0].ring;

-+ /*

-+ * FIXME we don't keep track of the dequeue pointer very well after a

-+ * Set TR dequeue pointer, so we're setting the dequeue pointer of the

-+ * host to our enqueue pointer. This should only be called after a

-+ * configured device has reset, so all control transfers should have

-+ * been completed or cancelled before the reset.

-+ */

-+ ep0_ctx->deq = xhci_trb_virt_to_dma(ep_ring->enq_seg, ep_ring->enqueue);

-+ ep0_ctx->deq |= ep_ring->cycle_state;

-+}

-+

- /* Setup an xHCI virtual device for a Set Address command */

- int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *udev)

- {

---- a/drivers/usb/host/xhci.c

-+++ b/drivers/usb/host/xhci.c

-@@ -2134,6 +2134,8 @@ int xhci_address_device(struct usb_hcd *

- /* If this is a Set Address to an unconfigured device, setup ep 0 */

- if (!udev->config)

- xhci_setup_addressable_virt_dev(xhci, udev);

-+ else

-+ xhci_copy_ep0_dequeue_into_input_ctx(xhci, udev);

- /* Otherwise, assume the core has the device configured how it wants */

- xhci_dbg(xhci, "Slot ID %d Input Context:\n", udev->slot_id);

- xhci_dbg_ctx(xhci, virt_dev->in_ctx, 2);

---- a/drivers/usb/host/xhci.h

-+++ b/drivers/usb/host/xhci.h

-@@ -1292,6 +1292,8 @@ int xhci_mem_init(struct xhci_hcd *xhci,

- void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id);

- int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id, struct usb_device *udev, gfp_t flags);

- int xhci_setup_addressable_virt_dev(struct xhci_hcd *xhci, struct usb_device *udev);

-+void xhci_copy_ep0_dequeue_into_input_ctx(struct xhci_hcd *xhci,

-+ struct usb_device *udev);

- unsigned int xhci_get_endpoint_index(struct usb_endpoint_descriptor *desc);

- unsigned int xhci_get_endpoint_flag(struct usb_endpoint_descriptor *desc);

- unsigned int xhci_get_endpoint_flag_from_index(unsigned int ep_index);

-From sarah.a.sharp@linux.intel.com Wed Jul 21 11:51:34 2010

-Date: Sat, 10 Jul 2010 15:48:01 +0200

-From: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-To: Greg KH <gregkh@suse.de>

-Cc: linux-usb@vger.kernel.org

-Subject: USB: xhci: Set Mult field in endpoint context correctly.

-Message-ID: <20100710134801.GA2062@xanatos>

-Content-Disposition: inline

-

-The bmAttributes field of the SuperSpeed Endpoint Companion Descriptor has

-different meanings, depending on the endpoint type. If the endpoint is

-isochronous, the bmAttributes field is the maximum number of packets

-within a service interval that this endpoint supports. If the endpoint is

-bulk, it's the number of stream IDs this endpoint supports.

-

-Only set the Mult field of the xHCI endpoint context using the

-bmAttributes field if the endpoint is isochronous, and the device is a

-SuperSpeed device.

-

-Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

-Cc: stable <stable@kernel.org>

-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

-

----

- drivers/usb/host/xhci-mem.c | 5 +++--

- 1 file changed, 3 insertions(+), 2 deletions(-)

-

---- a/drivers/usb/host/xhci-mem.c

-+++ b/drivers/usb/host/xhci-mem.c

-@@ -1023,7 +1023,7 @@ static inline unsigned int xhci_get_endp

- return EP_INTERVAL(interval);

- }

-

--/* The "Mult" field in the endpoint context is only set for SuperSpeed devices.

-+/* The "Mult" field in the endpoint context is only set for SuperSpeed isoc eps.

- * High speed endpoint descriptors can define "the number of additional

- * transaction opportunities per microframe", but that goes in the Max Burst

- * endpoint context field.

-@@ -1031,7 +1031,8 @@ static inline unsigned int xhci_get_endp

- static inline u32 xhci_get_endpoint_mult(struct usb_device *udev,

- struct usb_host_endpoint *ep)

- {

-- if (udev->speed != USB_SPEED_SUPER)

-+ if (udev->speed != USB_SPEED_SUPER ||

-+ !usb_endpoint_xfer_isoc(&ep->desc))

- return 0;

- return ep->ss_ep_comp.bmAttributes;

- }

-From linux-usb-owner@vger.kernel.org Wed Jul 21 12:56:05 2010

-From: Eric Miao <eric.y.miao@gmail.com>

-Date: Thu, 15 Jul 2010 17:38:36 +0800

-Message-ID: <AANLkTim6SD-dy6iK-QspagJeWQJPAJ-FrE0AW8pAlXTb@mail.gmail.com>

-Subject: usb: pxa: fix incorrect CONFIG_CPU_PXA27x to CONFIG_PXA27x

-To: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>

-Cc: Russell King <linux@arm.linux.org.uk>,

- David Brownell <dbrownell@users.sourceforge.net>,

- Greg Kroah-Hartman <gregkh@suse.de>,

- Robert Jarzmik <robert.jarzmik@free.fr>,

- H Hartley Sweeten <hsweeten@visionengravers.com>,

- =?UTF-8?Q?Andr=C3=A9_Goddard_Rosa?= <andre.goddard@gmail.com>,

- Tejun Heo <tj@kernel.org>,

- Andrew Morton <akpm@linux-foundation.org>,

- Mike Rapoport <mike@compulab.co.il>,

- Alexey Dobriyan <adobriyan@gmail.com>,

- linux-arm-kernel@lists.infradead.org, linux-usb@vger.kernel.org,

- linux-kernel@vger.kernel.org,

- vamos-dev@i4.informatik.uni-erlangen.de

-

-

-Reported-by: Christian Dietrich <qy03fugy@stud.informatik.uni-erlangen.de>

-Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

-

----

- drivers/usb/gadget/pxa27x_udc.c | 2 +-

- drivers/usb/host/ohci-pxa27x.c | 2 +-

- 2 files changed, 2 insertions(+), 2 deletions(-)

-

---- a/drivers/usb/gadget/pxa27x_udc.c

-+++ b/drivers/usb/gadget/pxa27x_udc.c

-@@ -2561,7 +2561,7 @@ static void pxa_udc_shutdown(struct plat

- udc_disable(udc);

- }

-

--#ifdef CONFIG_CPU_PXA27x

-+#ifdef CONFIG_PXA27x

- extern void pxa27x_clear_otgph(void);

- #else

- #define pxa27x_clear_otgph() do {} while (0)

---- a/drivers/usb/host/ohci-pxa27x.c

-+++ b/drivers/usb/host/ohci-pxa27x.c

-@@ -203,7 +203,7 @@ static inline void pxa27x_reset_hc(struc

- __raw_writel(uhchr & ~UHCHR_FHR, ohci->mmio_base + UHCHR);

- }

-

--#ifdef CONFIG_CPU_PXA27x

-+#ifdef CONFIG_PXA27x

- extern void pxa27x_clear_otgph(void);

- #else

- #define pxa27x_clear_otgph() do {} while (0)

-2.6.35-rc5