[PATCH] usb suspend updates (interface suspend)
This is the first of a few installments of PM API updates to match the recent switch to "pm_message_t". This installment primarily affects USB device drivers (for USB interfaces), and it changes the handful of drivers which currently implement suspend methods: - <linux/usb.h> and usbcore, signature change - Some drivers only changed the signature, net effect this just shuts up "sparse -Wbitwise": * hid-core * stir4200 - Two network drivers did that, and also grew slightly more featureful suspend code ... they now properly shut down their activities. (As should stir4200...) * pegasus * usbnet Note that the Wake-On-Lan (WOL) support in pegasus doesn't yet work; looks to me like it's missing a request to turn it on, vs just configuring it. The ASIX code in usbnet also has WOL hooks that are ready to use; untested. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Index: gregkh-2.6/drivers/net/irda/stir4200.c ===================================================================
This commit is contained in:
@ -1731,7 +1731,7 @@ static int finish_port_resume(struct usb_device *udev)
|
||||
struct usb_driver *driver;
|
||||
|
||||
intf = udev->actconfig->interface[i];
|
||||
if (intf->dev.power.power_state == PM_SUSPEND_ON)
|
||||
if (intf->dev.power.power_state == PMSG_SUSPEND)
|
||||
continue;
|
||||
if (!intf->dev.driver) {
|
||||
/* FIXME maybe force to alt 0 */
|
||||
@ -1745,7 +1745,7 @@ static int finish_port_resume(struct usb_device *udev)
|
||||
|
||||
/* can we do better than just logging errors? */
|
||||
status = driver->resume(intf);
|
||||
if (intf->dev.power.power_state != PM_SUSPEND_ON
|
||||
if (intf->dev.power.power_state != PMSG_ON
|
||||
|| status)
|
||||
dev_dbg(&intf->dev,
|
||||
"resume fail, state %d code %d\n",
|
||||
|
Reference in New Issue
Block a user