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-qcom-apq8064-sata.c | |
parent | fc625960edecfb57e62c2975d1f155155e28e6ba (diff) | |
parent | eee47538ec1f26198cf5da675975b61d7f16135b (diff) | |
download | op-kernel-dev-842f57baab186417d89810f3dd6147f1ef3009dd.zip op-kernel-dev-842f57baab186417d89810f3dd6147f1ef3009dd.tar.gz |
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-qcom-apq8064-sata.c')
-rw-r--r-- | drivers/phy/phy-qcom-apq8064-sata.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/phy/phy-qcom-apq8064-sata.c b/drivers/phy/phy-qcom-apq8064-sata.c index 7b3ddfb..4b243f7 100644 --- a/drivers/phy/phy-qcom-apq8064-sata.c +++ b/drivers/phy/phy-qcom-apq8064-sata.c @@ -228,8 +228,7 @@ static int qcom_apq8064_sata_phy_probe(struct platform_device *pdev) if (IS_ERR(phy->mmio)) return PTR_ERR(phy->mmio); - generic_phy = devm_phy_create(dev, NULL, &qcom_apq8064_sata_phy_ops, - NULL); + generic_phy = devm_phy_create(dev, NULL, &qcom_apq8064_sata_phy_ops); if (IS_ERR(generic_phy)) { dev_err(dev, "%s: failed to create phy\n", __func__); return PTR_ERR(generic_phy); |