Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9597362d 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: ohci: fix 2 timers to fire at jiffies + 1s
  USB: Allow initialization of broken keyspan serial adapters.
  USB: fix bug in sg initialization in usbtest
  USB: serial: fix regression in Visor/Palm OS module for kernels >= 2.6.24
  USB: cp2101: Add identifiers for the Telegesys ETRX2USB
  USB: serial: ti_usb_3410_5052: Correct TUSB3410 endpoint requirements.
  USB: another ehci_iaa_watchdog fix
parents 06f11f37 9cebcdc7

drivers/usb/host/ehci-hub.c

+3 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) 
		hcd->state = HC_STATE_QUIESCING;

	}

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

	if (ehci->reclaim)

		end_unlink_async(ehci);

	ehci_work(ehci);



	/* Unlike other USB host controller types, EHCI doesn't have
@@ -180,6 +178,9 @@ static int ehci_bus_suspend (struct usb_hcd *hcd) 
	ehci_halt (ehci);

	hcd->state = HC_STATE_SUSPENDED;



	if (ehci->reclaim)

		end_unlink_async(ehci);



	/* allow remote wakeup */

	mask = INTR_MASK;

	if (!device_may_wakeup(&hcd->self.root_hub->dev))

drivers/usb/host/ohci-hcd.c

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ static void unlink_watchdog_func(unsigned long _ohci) 
out:

	kfree(seen);

	if (ohci->eds_scheduled)

		mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ));

		mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));

done:

	spin_unlock_irqrestore(&ohci->lock, flags);

}

drivers/usb/host/ohci-q.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed) 
	if (quirk_zfmicro(ohci)

			&& (ed->type == PIPE_INTERRUPT)

			&& !(ohci->eds_scheduled++))

		mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ));

		mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));

	wmb ();



	/* we care about rm_list when setting CLE/BLE in case the HC was at

drivers/usb/misc/usbtest.c

+2 −1
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ alloc_sglist (int nents, int max, int vary) 
	sg = kmalloc (nents * sizeof *sg, GFP_KERNEL);

	if (!sg)

		return NULL;

	sg_init_table(sg, nents);



	for (i = 0; i < nents; i++) {

		char		*buf;
@@ -390,7 +391,7 @@ alloc_sglist (int nents, int max, int vary) 
		}



		/* kmalloc pages are always physically contiguous! */

		sg_init_one(&sg[i], buf, size);

		sg_set_buf(&sg[i], buf, size);



		switch (pattern) {

		case 0:

drivers/usb/serial/cp2101.c

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static struct usb_device_id id_table [] = { 
	{ USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */

	{ USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */

	{ USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */

	{ USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */

	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */