projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/phy-rcar-gen2-usb-to-v3.15' into backport/v3...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
phy
/
phy-omap-usb2.c
diff --git
a/drivers/phy/phy-omap-usb2.c
b/drivers/phy/phy-omap-usb2.c
index
7699752
..
b1685bf
100644
(file)
--- a/
drivers/phy/phy-omap-usb2.c
+++ b/
drivers/phy/phy-omap-usb2.c
@@
-203,7
+203,7
@@
static int omap_usb2_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, phy);
pm_runtime_enable(phy->dev);
platform_set_drvdata(pdev, phy);
pm_runtime_enable(phy->dev);
- generic_phy = devm_phy_create(phy->dev, &ops, NULL);
+ generic_phy = devm_phy_create(phy->dev,
NULL,
&ops, NULL);
if (IS_ERR(generic_phy))
return PTR_ERR(generic_phy);
if (IS_ERR(generic_phy))
return PTR_ERR(generic_phy);