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

Commit 29ac8cab authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
  USB: Nikon D80 unusual device patch
  EHCI: fix remote wakeup regression in 2.6.21-rc
parents c48ea603 2ea547d2

drivers/usb/host/ehci-hcd.c

+1 −0
Original line number Diff line number Diff line
@@ -669,6 +669,7 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd) 
			 */

			ehci->reset_done [i] = jiffies + msecs_to_jiffies (20);

			ehci_dbg (ehci, "port %d remote wakeup\n", i + 1);

			mod_timer(&hcd->rh_timer, ehci->reset_done[i]);

		}

	}

drivers/usb/storage/unusual_devs.h

+7 −0
Original line number Diff line number Diff line
@@ -327,6 +327,13 @@ UNUSUAL_DEV( 0x04b0, 0x040d, 0x0100, 0x0100, 
		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_CAPACITY),



/* Reported by Emil Larsson <emil@swip.net> */

UNUSUAL_DEV(  0x04b0, 0x0411, 0x0100, 0x0100,

		"NIKON",

		"NIKON DSC D80",

		US_SC_DEVICE, US_PR_DEVICE, NULL,

		US_FL_FIX_CAPACITY),



/* BENQ DC5330

 * Reported by Manuel Fombuena <mfombuena@ya.com> and

 * Frank Copeland <fjc@thingy.apana.org.au> */