diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-27 17:25:20 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-27 17:25:20 +0100 |
commit | 842f57baab186417d89810f3dd6147f1ef3009dd (patch) | |
tree | 63150a49c6ce3ba28d5a98abbab780b4fe8022dc /drivers/phy/phy-spear1310-miphy.c | |
parent | USB: adutux: NULL dereferences on disconnect (diff) | |
parent | phy: add support for USB cluster on the Armada 375 SoC (diff) | |
download | linux-842f57baab186417d89810f3dd6147f1ef3009dd.tar.xz linux-842f57baab186417d89810f3dd6147f1ef3009dd.zip |
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-spear1310-miphy.c')
-rw-r--r-- | drivers/phy/phy-spear1310-miphy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/phy-spear1310-miphy.c b/drivers/phy/phy-spear1310-miphy.c index 5f4c586ee951..9f47fae7eecb 100644 --- a/drivers/phy/phy-spear1310-miphy.c +++ b/drivers/phy/phy-spear1310-miphy.c @@ -227,7 +227,7 @@ static int spear1310_miphy_probe(struct platform_device *pdev) return -EINVAL; } - priv->phy = devm_phy_create(dev, NULL, &spear1310_miphy_ops, NULL); + priv->phy = devm_phy_create(dev, NULL, &spear1310_miphy_ops); if (IS_ERR(priv->phy)) { dev_err(dev, "failed to create SATA PCIe PHY\n"); return PTR_ERR(priv->phy); |