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

Merge tag 'v3.17-rc4' into next

Browse Source 
Merge Linux 3.17-rc4 here so we have all the latest
fixes on next too. This also cleans up a few conflicts
when applying patches.

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

Conflicts:
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/function/Makefile
	drivers/usb/gadget/legacy/Makefile
	drivers/usb/phy/phy-samsung-usb.h
This commit is contained in:
Felipe Balbi
2014-09-08 14:39:01 -05:00
parent efb540c895 2ce7598c9a
commit f7cc38b16e
693 changed files with 7013 additions and 3454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/phy/phy-msm-usb.c
View File

@@ -1604,8 +1604,8 @@ static int msm_otg_probe(struct platform_device *pdev)
*/
if (motg->phy_number) {
phy_select = devm_ioremap_nocache(&pdev->dev, USB2_PHY_SEL, 4);
if (IS_ERR(phy_select))
return PTR_ERR(phy_select);
if (!phy_select)
return -ENOMEM;
/* Enable second PHY with the OTG port */
writel(0x1, phy_select);
}