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

Commit d59abb93 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 3.13-rc4 into usb-next

parents 319e2e3f 3d724fa5

drivers/staging/dwc2/hcd.c

+2 −0
Original line number Diff line number Diff line
@@ -2921,6 +2921,8 @@ int dwc2_hcd_init(struct dwc2_hsotg *hsotg, int irq, 
	if (retval < 0)

		goto error3;



	device_wakeup_enable(hcd->self.controller);



	dwc2_hcd_dump_state(hsotg);



	dwc2_enable_global_interrupts(hsotg);

drivers/staging/octeon-usb/octeon-hcd.c

+1 −0
Original line number Diff line number Diff line
@@ -3498,6 +3498,7 @@ static int octeon_usb_driver_probe(struct device *dev) 
		kfree(hcd);

		return -1;

	}

	device_wakeup_enable(hcd->self.controller);



	dev_dbg(dev, "Registered HCD for port %d on irq %d\n", usb_num, irq);

drivers/staging/ozwpan/ozhcd.c

+2 −0
Original line number Diff line number Diff line
@@ -2270,6 +2270,8 @@ static int oz_plat_probe(struct platform_device *dev) 
		usb_put_hcd(hcd);

		return -1;

	}

	device_wakeup_enable(hcd->self.controller);



	spin_lock_bh(&g_hcdlock);

	g_ozhcd = ozhcd;

	spin_unlock_bh(&g_hcdlock);

drivers/usb/c67x00/c67x00-hcd.c

+2 −0
Original line number Diff line number Diff line
@@ -384,6 +384,8 @@ int c67x00_hcd_probe(struct c67x00_sie *sie) 
		goto err2;

	}



	device_wakeup_enable(hcd->self.controller);



	spin_lock_irqsave(&sie->lock, flags);

	sie->private_data = c67x00;

	sie->irq = c67x00_hcd_irq;

drivers/usb/chipidea/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,5 +17,5 @@ ifneq ($(CONFIG_PCI),) 
endif



ifneq ($(CONFIG_OF),)

	obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_imx.o usbmisc_imx.o

	obj-$(CONFIG_USB_CHIPIDEA)	+= usbmisc_imx.o ci_hdrc_imx.o

endif