diff options
author | Mark Brown <broonie@linaro.org> | 2014-01-15 15:46:35 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-01-15 15:46:35 +0400 |
commit | 598911b42c940158caa1169092a804903bde845e (patch) | |
tree | 15487a73d3854488ef679ee920c48fe1a90c28b3 /drivers/usb/phy/phy-mxs-usb.c | |
parent | 1eb72f0b98fe7ea1c4bb2e9e294a865b044b2a82 (diff) | |
parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
download | linux-598911b42c940158caa1169092a804903bde845e.tar.xz |
Merge tag 'v3.13-rc4' into regulator-pfuze100
Linux 3.13-rc4
Diffstat (limited to 'drivers/usb/phy/phy-mxs-usb.c')
-rw-r--r-- | drivers/usb/phy/phy-mxs-usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c index fdd33b44dbd3..545844b7e796 100644 --- a/drivers/usb/phy/phy-mxs-usb.c +++ b/drivers/usb/phy/phy-mxs-usb.c @@ -164,7 +164,7 @@ static int mxs_phy_probe(struct platform_device *pdev) mxs_phy->clk = clk; - platform_set_drvdata(pdev, &mxs_phy->phy); + platform_set_drvdata(pdev, mxs_phy); ret = usb_add_phy_dev(&mxs_phy->phy); if (ret) |