diff options
| author |   hayeswang <hayeswang@realtek.com> | 2013-07-31 17:21:23 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-07-31 14:49:13 -0700 |
| commit | b771721a748875e3654debdf68ad4708477f18c4 (patch) | |
| tree | cc6d39e3d537300212509aa53f2fc0049fabdedf /drivers | |
| parent | net/usb/r815x: replace USB buffer from stack to DMA-able (diff) | |
| download | linux-dev-b771721a748875e3654debdf68ad4708477f18c4.tar.xz linux-dev-b771721a748875e3654debdf68ad4708477f18c4.zip | |
net/usb/r815x: avoid to call mdio functions for runtime-suspended device
Don't replace the usb_control_msg() with usbnet_{read,write}_cmd()
which couldn't be called inside suspend/resume callback. Keep the
basic functions unlimited. Instead, using usb_autopm_get_interface()
and usb_autopm_put_interface() in r815x_mdio_{read,write}().
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/r815x.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/net/usb/r815x.c b/drivers/net/usb/r815x.c index e9b99bad02a7..1a80e76ce0b9 100644 --- a/drivers/net/usb/r815x.c +++ b/drivers/net/usb/r815x.c @@ -126,11 +126,18 @@ out1: static int r815x_mdio_read(struct net_device *netdev, int phy_id, int reg) { struct usbnet *dev = netdev_priv(netdev); + int ret; if (phy_id != R815x_PHY_ID) return -EINVAL; - return ocp_reg_read(dev, BASE_MII + reg * 2); + if (usb_autopm_get_interface(dev->intf) < 0) + return -ENODEV; + + ret = ocp_reg_read(dev, BASE_MII + reg * 2); + + usb_autopm_put_interface(dev->intf); + return ret; } static @@ -141,7 +148,12 @@ void r815x_mdio_write(struct net_device *netdev, int phy_id, int reg, int val) if (phy_id != R815x_PHY_ID) return; + if (usb_autopm_get_interface(dev->intf) < 0) + return; + ocp_reg_write(dev, BASE_MII + reg * 2, val); + + usb_autopm_put_interface(dev->intf); } static int r8153_bind(struct usbnet *dev, struct usb_interface *intf) |