summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Glendinning <steve.glendinning@shawell.net>2012-11-30 05:52:43 +0100
committerDavid S. Miller <davem@davemloft.net>2012-11-30 18:27:20 +0100
commit2305c54ffc389f1e73f2b1122a4c75bb0e8e6601 (patch)
tree414cfe6e0d31e634ae47d27c7d2ad9445d7bbeaf
parentsctp: verify length provided in heartbeat information parameter (diff)
downloadlinux-2305c54ffc389f1e73f2b1122a4c75bb0e8e6601.tar.xz
linux-2305c54ffc389f1e73f2b1122a4c75bb0e8e6601.zip
smsc75xx: don't call usbnet_resume if usbnet_suspend fails
If usbnet_suspend returns an error we don't want to call usbnet_resume to clean up, but instead just return the error. If usbnet_suspend *does* succeed, and we have a problem further on, the desired behaviour is still to call usbnet_resume to clean up before returning. Signed-off-by: Steve Glendinning <steve.glendinning@shawell.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/usb/smsc75xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 18238060f1c0..86d924951d2e 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -1411,7 +1411,7 @@ static int smsc75xx_suspend(struct usb_interface *intf, pm_message_t message)
int ret;
ret = usbnet_suspend(intf, message);
- check_warn_goto_done(ret, "usbnet_suspend error\n");
+ check_warn_return(ret, "usbnet_suspend error\n");
if (pdata->suspend_flags) {
netdev_warn(dev->net, "error during last resume\n");