Commit 2305c54f authored Nov 30, 2012 by Steve Glendinning Committed by David S. Miller Nov 30, 2012

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>

parent 06a31e2b

drivers/net/usb/smsc75xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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");