diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 10:56:43 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 10:56:43 +0300 |
| commit | 301a36fa700f9add6e14f5a95c7573e01578343a (patch) | |
| tree | 6ff94ff3b08b838353b9127eb5f8055b3de6b25f /drivers/phy/phy-sun9i-usb.c | |
| parent | b828f960215f02e5d2c88bbd27565c694254a15a (diff) | |
| parent | b60752f2b20c167859943e001727f0d4da419b23 (diff) | |
| download | linux-301a36fa700f9add6e14f5a95c7573e01578343a.tar.xz | |
Merge branches 'misc' and 'sa1111-base' into for-linus
Diffstat (limited to 'drivers/phy/phy-sun9i-usb.c')
| -rw-r--r-- | drivers/phy/phy-sun9i-usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/phy/phy-sun9i-usb.c b/drivers/phy/phy-sun9i-usb.c index ac4f31abefe3..28fce4bce638 100644 --- a/drivers/phy/phy-sun9i-usb.c +++ b/drivers/phy/phy-sun9i-usb.c @@ -141,9 +141,9 @@ static int sun9i_usb_phy_probe(struct platform_device *pdev) } phy->hsic_clk = devm_clk_get(dev, "hsic_12M"); - if (IS_ERR(phy->clk)) { + if (IS_ERR(phy->hsic_clk)) { dev_err(dev, "failed to get hsic_12M clock\n"); - return PTR_ERR(phy->clk); + return PTR_ERR(phy->hsic_clk); } phy->reset = devm_reset_control_get(dev, "hsic"); |