tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
"Here are two USB fixes for 3.11-rc7

One fixes a reported regression in the OHCI driver, and the other
fixes a reported build breakage in the USB phy drivers"

* tag 'usb-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
usb: phy: fix build breakage
USB: OHCI: add missing PCI PM callbacks to ohci-pci.c

Linus Torvalds 5e25e4f3 1b4757ee

+7 -2
+5
drivers/usb/host/ohci-pci.c
··· 304 304 pr_info("%s: " DRIVER_DESC "\n", hcd_name); 305 305 306 306 ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides); 307 + 308 + /* Entries for the PCI suspend/resume callbacks are special */ 309 + ohci_pci_hc_driver.pci_suspend = ohci_suspend; 310 + ohci_pci_hc_driver.pci_resume = ohci_resume; 311 + 307 312 return pci_register_driver(&ohci_pci_driver); 308 313 } 309 314 module_init(ohci_pci_init);
+1 -1
drivers/usb/phy/phy-fsl-usb.h
··· 15 15 * 675 Mass Ave, Cambridge, MA 02139, USA. 16 16 */ 17 17 18 - #include "otg_fsm.h" 18 + #include "phy-fsm-usb.h" 19 19 #include <linux/usb/otg.h> 20 20 #include <linux/ioctl.h> 21 21
+1 -1
drivers/usb/phy/phy-fsm-usb.c
··· 29 29 #include <linux/usb/gadget.h> 30 30 #include <linux/usb/otg.h> 31 31 32 - #include "phy-otg-fsm.h" 32 + #include "phy-fsm-usb.h" 33 33 34 34 /* Change USB protocol when there is a protocol change */ 35 35 static int otg_set_protocol(struct otg_fsm *fsm, int protocol)