diff options
| author | Joonyoung Shim <jy0922.shim@samsung.com> | 2014-07-08 17:03:15 +0900 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2014-07-14 05:14:19 -0700 |
| commit | 4a6752ae8667868d5f19c821354115d80fb5d686 (patch) | |
| tree | ca40f1a9c19f7331cb3e0e4e118e1b0ba9f27581 | |
| parent | bc6af55b81d6003449d6b54e6a934f01c8d063b6 (diff) | |
| download | linux-3.10-4a6752ae8667868d5f19c821354115d80fb5d686.tar.gz linux-3.10-4a6752ae8667868d5f19c821354115d80fb5d686.tar.bz2 linux-3.10-4a6752ae8667868d5f19c821354115d80fb5d686.zip | |
usbnet: smsc95xx: add reset_resume function with reset operation
The smsc95xx needs to resume with reset operation. Otherwise it causes
system hang by network error like below after resume. This case appears
on odroid u3 board.
[ 9.727600] smsc95xx 1-2:1.0 eth0: kevent 2 may have been dropped
[ 9.727648] smsc95xx 1-2:1.0 eth0: kevent 2 may have been dropped
[ 9.727689] smsc95xx 1-2:1.0 eth0: kevent 2 may have been dropped
[ 9.727728] smsc95xx 1-2:1.0 eth0: kevent 2 may have been dropped
[ 9.729486] PM: resume of devices complete after 2011.219 msecs
[ 10.117609] Restarting tasks ... done.
[ 11.725099] smsc95xx 1-2:1.0 eth0: kevent 2 may have been dropped
[ 13.480846] smsc95xx 1-2:1.0 eth0: kevent 2 may have been dropped
[ 13.481361] smsc95xx 1-2:1.0 eth0: kevent 2 may have been dropped
...
Change-Id: I47bd52d7168ab7ec362d2de7c05d6817f2f14f9f
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
| -rw-r--r-- | drivers/net/usb/smsc95xx.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 9375b8c6410..7ce9b3fa1be 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1716,6 +1716,18 @@ static int smsc95xx_resume(struct usb_interface *intf) return ret; } +static int smsc95xx_reset_resume(struct usb_interface *intf) +{ + struct usbnet *dev = usb_get_intfdata(intf); + int ret; + + ret = smsc95xx_reset(dev); + if (ret < 0) + return ret; + + return smsc95xx_resume(intf); +} + static void smsc95xx_rx_csum_offload(struct sk_buff *skb) { skb->csum = *(u16 *)(skb_tail_pointer(skb) - 2); @@ -2006,7 +2018,7 @@ static struct usb_driver smsc95xx_driver = { .probe = usbnet_probe, .suspend = smsc95xx_suspend, .resume = smsc95xx_resume, - .reset_resume = smsc95xx_resume, + .reset_resume = smsc95xx_reset_resume, .disconnect = usbnet_disconnect, .disable_hub_initiated_lpm = 1, .supports_autosuspend = 1, |