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

Commit 5e25e4f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1b4757ee 52d5b9ab

drivers/usb/host/ohci-pci.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -304,6 +304,11 @@ static int __init ohci_pci_init(void) 
	pr_info("%s: " DRIVER_DESC "\n", hcd_name);

	pr_info("%s: " DRIVER_DESC "\n", hcd_name);





	ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides);

	ohci_init_driver(&ohci_pci_hc_driver, &pci_overrides);



	/* Entries for the PCI suspend/resume callbacks are special */

	ohci_pci_hc_driver.pci_suspend = ohci_suspend;

	ohci_pci_hc_driver.pci_resume = ohci_resume;



	return pci_register_driver(&ohci_pci_driver);

	return pci_register_driver(&ohci_pci_driver);

}

}

module_init(ohci_pci_init);

module_init(ohci_pci_init);

drivers/usb/phy/phy-fsl-usb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * 675 Mass Ave, Cambridge, MA 02139, USA.

 * 675 Mass Ave, Cambridge, MA 02139, USA.

 */

 */





#include "otg_fsm.h"

#include "phy-fsm-usb.h"

#include <linux/usb/otg.h>

#include <linux/usb/otg.h>

#include <linux/ioctl.h>

#include <linux/ioctl.h>

drivers/usb/phy/phy-fsm-usb.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/usb/gadget.h>

#include <linux/usb/gadget.h>

#include <linux/usb/otg.h>

#include <linux/usb/otg.h>





#include "phy-otg-fsm.h"

#include "phy-fsm-usb.h"





/* Change USB protocol when there is a protocol change */

/* Change USB protocol when there is a protocol change */

static int otg_set_protocol(struct otg_fsm *fsm, int protocol)

static int otg_set_protocol(struct otg_fsm *fsm, int protocol)