Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b771721a authored by hayeswang's avatar hayeswang Committed by David S. Miller
Browse files

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: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b2f47377

drivers/net/usb/r815x.c

+13 −1
Original line number Diff line number Diff line
@@ -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)