diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-24 16:48:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-24 16:48:28 -0700 |
| commit | e6ff4c75f9095f61b3a66c2a78e47b62864022dd (patch) | |
| tree | 425ea9463cbec0b1975b8a33d9a56817143055d0 /drivers/usb/phy/phy-mv-usb.c | |
| parent | ee9c799c231324de681eb21e06d8bf4842768b75 (diff) | |
| parent | 0e255f1c0c9add2f0c920240ac4cadc28ae274c3 (diff) | |
| download | blackbird-op-linux-e6ff4c75f9095f61b3a66c2a78e47b62864022dd.tar.gz blackbird-op-linux-e6ff4c75f9095f61b3a66c2a78e47b62864022dd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/phy/phy-mv-usb.c')
| -rw-r--r-- | drivers/usb/phy/phy-mv-usb.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/usb/phy/phy-mv-usb.c b/drivers/usb/phy/phy-mv-usb.c index c987bbe27851..4a6b03c73876 100644 --- a/drivers/usb/phy/phy-mv-usb.c +++ b/drivers/usb/phy/phy-mv-usb.c @@ -667,7 +667,6 @@ int mv_otg_remove(struct platform_device *pdev) mv_otg_disable(mvotg); usb_remove_phy(&mvotg->phy); - platform_set_drvdata(pdev, NULL); return 0; } @@ -850,8 +849,6 @@ err_destroy_workqueue: flush_workqueue(mvotg->qwork); destroy_workqueue(mvotg->qwork); - platform_set_drvdata(pdev, NULL); - return retval; } |
