Commit 2b752acd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB:Update mailing list information in documentation
  USB: fix ehci unlink regressions
  USB: new ftdi_sio device id
  USB: Remove __KERNEL__ check from non-exported gadget.h.
  USB: g_printer.h does not need to be "unifdef"ed.
  USB: fsl_usb2_udc: fix broken Kconfig
  USB: option: add novatel device ids
  USB: usbaudio: handle kcalloc failure
  USB: cypress_m8: add UPS Powercom (0d9f:0002)
  USB: drivers/usb/storage/sddr55.c: fix uninitialized var warnings
  USB: fix usb-serial generic recursive lock
parents f5dbb55b 15c4a4e2

Documentation/usb/usb-help.txt

+3 −5
Original line number Diff line number Diff line 
usb-help.txt

2000-July-12

2008-Mar-7



For USB help other than the readme files that are located in

Documentation/usb/*, see the following:
@@ -11,8 +11,6 @@ Linux USB Guide: http://linux-usb.sourceforge.net 
Linux-USB device overview (working devices and drivers):

                    http://www.qbik.ch/usb/devices/



The Linux-USB mailing lists are:

  linux-usb-users@lists.sourceforge.net   for general user help

  linux-usb-devel@lists.sourceforge.net   for developer discussions

The Linux-USB mailing list is at linux-usb@vger.kernel.org



###

drivers/usb/gadget/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ config USB_ATMEL_USBA 


config USB_GADGET_FSL_USB2

	boolean "Freescale Highspeed USB DR Peripheral Controller"

	depends on MPC834x || PPC_MPC831x

	depends on FSL_SOC

	select USB_GADGET_DUALSPEED

	help

	   Some of Freescale PowerPC processors have a High Speed

drivers/usb/host/ehci-hcd.c

+46 −16
Original line number Diff line number Diff line
@@ -281,23 +281,44 @@ static void ehci_iaa_watchdog(unsigned long param) 
{

	struct ehci_hcd		*ehci = (struct ehci_hcd *) param;

	unsigned long		flags;

	u32			status, cmd;



	spin_lock_irqsave (&ehci->lock, flags);

	WARN_ON(!ehci->reclaim);



	status = ehci_readl(ehci, &ehci->regs->status);

	/* Lost IAA irqs wedge things badly; seen first with a vt8235.

	 * So we need this watchdog, but must protect it against both

	 * (a) SMP races against real IAA firing and retriggering, and

	 * (b) clean HC shutdown, when IAA watchdog was pending.

	 */

	if (ehci->reclaim

			&& !timer_pending(&ehci->iaa_watchdog)

			&& HC_IS_RUNNING(ehci_to_hcd(ehci)->state)) {

		u32 cmd, status;



		/* If we get here, IAA is *REALLY* late.  It's barely

		 * conceivable that the system is so busy that CMD_IAAD

		 * is still legitimately set, so let's be sure it's

		 * clear before we read STS_IAA.  (The HC should clear

		 * CMD_IAAD when it sets STS_IAA.)

		 */

		cmd = ehci_readl(ehci, &ehci->regs->command);

	ehci_dbg(ehci, "IAA watchdog: status %x cmd %x\n", status, cmd);



	/* lost IAA irqs wedge things badly; seen first with a vt8235 */

	if (ehci->reclaim) {

		if (status & STS_IAA) {

			ehci_vdbg (ehci, "lost IAA\n");

		if (cmd & CMD_IAAD)

			ehci_writel(ehci, cmd & ~CMD_IAAD,

					&ehci->regs->command);



		/* If IAA is set here it either legitimately triggered

		 * before we cleared IAAD above (but _way_ late, so we'll

		 * still count it as lost) ... or a silicon erratum:

		 * - VIA seems to set IAA without triggering the IRQ;

		 * - IAAD potentially cleared without setting IAA.

		 */

		status = ehci_readl(ehci, &ehci->regs->status);

		if ((status & STS_IAA) || !(cmd & CMD_IAAD)) {

			COUNT (ehci->stats.lost_iaa);

			ehci_writel(ehci, STS_IAA, &ehci->regs->status);

		}

		ehci_writel(ehci, cmd & ~CMD_IAAD, &ehci->regs->command);



		ehci_vdbg(ehci, "IAA watchdog: status %x cmd %x\n",

				status, cmd);

		end_unlink_async(ehci);

	}
@@ -631,7 +652,7 @@ static int ehci_run (struct usb_hcd *hcd) 
static irqreturn_t ehci_irq (struct usb_hcd *hcd)

{

	struct ehci_hcd		*ehci = hcd_to_ehci (hcd);

	u32			status, pcd_status = 0;

	u32			status, pcd_status = 0, cmd;

	int			bh;



	spin_lock (&ehci->lock);
@@ -652,7 +673,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd) 


	/* clear (just) interrupts */

	ehci_writel(ehci, status, &ehci->regs->status);

	ehci_readl(ehci, &ehci->regs->command);	/* unblock posted write */

	cmd = ehci_readl(ehci, &ehci->regs->command);

	bh = 0;



#ifdef	EHCI_VERBOSE_DEBUG
@@ -673,8 +694,17 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd) 


	/* complete the unlinking of some qh [4.15.2.3] */

	if (status & STS_IAA) {

		/* guard against (alleged) silicon errata */

		if (cmd & CMD_IAAD) {

			ehci_writel(ehci, cmd & ~CMD_IAAD,

					&ehci->regs->command);

			ehci_dbg(ehci, "IAA with IAAD still set?\n");

		}

		if (ehci->reclaim) {

			COUNT(ehci->stats.reclaim);

			end_unlink_async(ehci);

		} else

			ehci_dbg(ehci, "IAA with nothing to reclaim?\n");

	}



	/* remote wakeup [4.3.1] */
@@ -781,7 +811,7 @@ static int ehci_urb_enqueue ( 
static void unlink_async (struct ehci_hcd *ehci, struct ehci_qh *qh)

{

	/* failfast */

	if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))

	if (!HC_IS_RUNNING(ehci_to_hcd(ehci)->state) && ehci->reclaim)

		end_unlink_async(ehci);



	/* if it's not linked then there's nothing to do */

drivers/usb/serial/cypress_m8.c

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ static struct usb_device_id id_table_earthmate [] = { 


static struct usb_device_id id_table_cyphidcomrs232 [] = {

	{ USB_DEVICE(VENDOR_ID_CYPRESS, PRODUCT_ID_CYPHIDCOM) },

	{ USB_DEVICE(VENDOR_ID_POWERCOM, PRODUCT_ID_UPS) },

	{ }						/* Terminating entry */

};
@@ -106,6 +107,7 @@ static struct usb_device_id id_table_combined [] = { 
	{ USB_DEVICE(VENDOR_ID_DELORME, PRODUCT_ID_EARTHMATEUSB) },

	{ USB_DEVICE(VENDOR_ID_DELORME, PRODUCT_ID_EARTHMATEUSB_LT20) },

	{ USB_DEVICE(VENDOR_ID_CYPRESS, PRODUCT_ID_CYPHIDCOM) },

	{ USB_DEVICE(VENDOR_ID_POWERCOM, PRODUCT_ID_UPS) },

	{ USB_DEVICE(VENDOR_ID_DAZZLE, PRODUCT_ID_CA42) },

	{ }						/* Terminating entry */

};

drivers/usb/serial/cypress_m8.h

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
#define VENDOR_ID_CYPRESS		 0x04b4

#define PRODUCT_ID_CYPHIDCOM		 0x5500



/* Powercom UPS, chip CY7C63723 */

#define VENDOR_ID_POWERCOM		 0x0d9f

#define PRODUCT_ID_UPS			 0x0002



/* Nokia CA-42 USB to serial cable */

#define VENDOR_ID_DAZZLE		0x07d0

#define PRODUCT_ID_CA42			0x4101

CRA Git | Maintained and supported by SUSTech CRA and CCSE