xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.17-rc5' into next

Browse Source 
Linux 3.17-rc5

Signed-off-by: Felipe Balbi <balbi@ti.com>

Conflicts:
	Documentation/devicetree/bindings/usb/mxs-phy.txt
	drivers/usb/phy/phy-mxs-usb.c
This commit is contained in:
Felipe Balbi
2014-09-16 09:53:59 -05:00
parent d9152161b4 9e82bf0141
commit 4cd41ffd27
331 changed files with 3960 additions and 2086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/gadget/udc/fusb300_udc.h
View File

@@ -12,7 +12,7 @@
#ifndef __FUSB300_UDC_H__
#define __FUSB300_UDC_H_
#define __FUSB300_UDC_H__
#include <linux/kernel.h>

2
drivers/usb/gadget/udc/net2280.c
View File

@@ -3320,7 +3320,7 @@ static void handle_stat1_irqs(struct net2280 *dev, u32 stat)
if (stat & tmp) {
writel(tmp, &dev->regs->irqstat1);
if ((((stat & BIT(ROOT_PORT_RESET_INTERRUPT)) &&
(readl(&dev->usb->usbstat) & mask)) ||
((readl(&dev->usb->usbstat) & mask) == 0)) ||
((readl(&dev->usb->usbctl) &
BIT(VBUS_PIN)) == 0)) &&
(dev->gadget.speed != USB_SPEED_UNKNOWN)) {