projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acpi-processor', 'acpi-hotplug' and 'acpi-battery'
[cascardo/linux.git]
/
drivers
/
phy
/
phy-twl4030-usb.c
diff --git
a/drivers/phy/phy-twl4030-usb.c
b/drivers/phy/phy-twl4030-usb.c
index
2e0e9b3
..
e1a6623
100644
(file)
--- a/
drivers/phy/phy-twl4030-usb.c
+++ b/
drivers/phy/phy-twl4030-usb.c
@@
-695,7
+695,7
@@
static int twl4030_usb_probe(struct platform_device *pdev)
otg->set_host = twl4030_set_host;
otg->set_peripheral = twl4030_set_peripheral;
otg->set_host = twl4030_set_host;
otg->set_peripheral = twl4030_set_peripheral;
- phy = devm_phy_create(twl->dev, &ops, init_data);
+ phy = devm_phy_create(twl->dev,
NULL,
&ops, init_data);
if (IS_ERR(phy)) {
dev_dbg(&pdev->dev, "Failed to create PHY\n");
return PTR_ERR(phy);
if (IS_ERR(phy)) {
dev_dbg(&pdev->dev, "Failed to create PHY\n");
return PTR_ERR(phy);