diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
| commit | 5af6a242945e39bf6ea39716d4eba316b735dce8 (patch) | |
| tree | 35363a04680e1618f6ed1c2b4eafbbc3d59ef048 /drivers/phy/phy-twl4030-usb.c | |
| parent | 7eff2ffe05a8b2c6c83a4f511ac6c31c858e3048 (diff) | |
| parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/phy/phy-twl4030-usb.c')
| -rw-r--r-- | drivers/phy/phy-twl4030-usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c index aaac3594f83b..452b637be676 100644 --- a/drivers/phy/phy-twl4030-usb.c +++ b/drivers/phy/phy-twl4030-usb.c @@ -777,6 +777,7 @@ static int twl4030_usb_remove(struct platform_device *pdev) struct twl4030_usb *twl = platform_get_drvdata(pdev); int val; + usb_remove_phy(&twl->phy); pm_runtime_get_sync(twl->dev); cancel_delayed_work(&twl->id_workaround_work); device_remove_file(twl->dev, &dev_attr_vbus); |