lkml.org 
[lkml]   [2013]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 2/5] net/usb/r815x: avoid to call mdio functions for runtime-suspended device
    Date
    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>
    ---
    drivers/net/usb/r815x.c | 14 +++++++++++++-
    1 file changed, 13 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/usb/r815x.c b/drivers/net/usb/r815x.c
    index e9b99ba..1a80e76 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)
    --
    1.8.3.1


    \
     
     \ /
      Last update: 2013-07-31 11:41    [W:3.014 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and my Meterkast|Read the blog