diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-27 08:25:20 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-27 08:25:20 -0800 |
| commit | 842f57baab186417d89810f3dd6147f1ef3009dd (patch) | |
| tree | 63150a49c6ce3ba28d5a98abbab780b4fe8022dc /drivers/phy/phy-omap-usb2.c | |
| parent | fc625960edecfb57e62c2975d1f155155e28e6ba (diff) | |
| parent | eee47538ec1f26198cf5da675975b61d7f16135b (diff) | |
Merge tag 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing
Kishon writes:
Improvements in phy-core specifically on PHY core finds the PHY in the case
of non-dt boot. Adds three new PHY drivers using the PHY framework and some
miscellaneous fixes and cleanups.
Diffstat (limited to 'drivers/phy/phy-omap-usb2.c')
| -rw-r--r-- | drivers/phy/phy-omap-usb2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c index 08f2da270837..4e489a8850e5 100644 --- a/drivers/phy/phy-omap-usb2.c +++ b/drivers/phy/phy-omap-usb2.c @@ -256,7 +256,7 @@ static int omap_usb2_probe(struct platform_device *pdev) platform_set_drvdata(pdev, phy); pm_runtime_enable(phy->dev); - generic_phy = devm_phy_create(phy->dev, NULL, &ops, NULL); + generic_phy = devm_phy_create(phy->dev, NULL, &ops); if (IS_ERR(generic_phy)) { pm_runtime_disable(phy->dev); return PTR_ERR(generic_phy); |