Commit a1c088e0 authored by Oliver Neukum's avatar Oliver Neukum Committed by David S. Miller
Browse files

usbnet: handle PM failure gracefully 



If a device fails to do remote wakeup, this is no reason
to abort an open totally. This patch just continues without
runtime PM.

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4945106d

drivers/net/usb/usbnet.c

+8 −7
Original line number Diff line number Diff line
@@ -719,7 +719,8 @@ int usbnet_stop (struct net_device *net) 
	dev->flags = 0;

	del_timer_sync (&dev->delay);

	tasklet_kill (&dev->bh);

	if (info->manage_power)

	if (info->manage_power &&

	    !test_and_clear_bit(EVENT_NO_RUNTIME_PM, &dev->flags))

		info->manage_power(dev, 0);

	else

		usb_autopm_put_interface(dev->intf);
@@ -794,14 +795,14 @@ int usbnet_open (struct net_device *net) 
	tasklet_schedule (&dev->bh);

	if (info->manage_power) {

		retval = info->manage_power(dev, 1);

		if (retval < 0)

			goto done_manage_power_error;

		if (retval < 0) {

			retval = 0;

			set_bit(EVENT_NO_RUNTIME_PM, &dev->flags);

		} else {

			usb_autopm_put_interface(dev->intf);

		}

	}

	return retval;



done_manage_power_error:

	clear_bit(EVENT_DEV_OPEN, &dev->flags);

done:

	usb_autopm_put_interface(dev->intf);

done_nopm:

include/linux/usb/usbnet.h

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct usbnet { 
#		define EVENT_DEV_ASLEEP 6

#		define EVENT_DEV_OPEN	7

#		define EVENT_DEVICE_REPORT_IDLE	8

#		define EVENT_NO_RUNTIME_PM	9

};



static inline struct usb_driver *driver_of(struct usb_interface *intf)