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-xgene.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-xgene.c')
| -rw-r--r-- | drivers/phy/phy-xgene.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/phy-xgene.c b/drivers/phy/phy-xgene.c index f8a51b16ade8..29214a36ea28 100644 --- a/drivers/phy/phy-xgene.c +++ b/drivers/phy/phy-xgene.c @@ -1707,7 +1707,7 @@ static int xgene_phy_probe(struct platform_device *pdev) ctx->dev = &pdev->dev; platform_set_drvdata(pdev, ctx); - ctx->phy = devm_phy_create(ctx->dev, NULL, &xgene_phy_ops, NULL); + ctx->phy = devm_phy_create(ctx->dev, NULL, &xgene_phy_ops); if (IS_ERR(ctx->phy)) { dev_dbg(&pdev->dev, "Failed to create PHY\n"); rc = PTR_ERR(ctx->phy); |