USB: interface PM state
This patch (as880) strives to keep the PM core's idea of a USB interface's power state in synch with usbcore's own idea. In the end this doesn't really matter, but it's better to be consistent. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
f6ace2c99a
commit
784a6e1cc4
|
@ -879,8 +879,6 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
|
|||
|
||||
done:
|
||||
// dev_dbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);
|
||||
if (status == 0)
|
||||
intf->dev.power.power_state.event = msg.event;
|
||||
return status;
|
||||
}
|
||||
|
||||
|
@ -920,8 +918,6 @@ static int usb_resume_interface(struct usb_interface *intf)
|
|||
|
||||
done:
|
||||
// dev_dbg(&intf->dev, "%s: status %d\n", __FUNCTION__, status);
|
||||
if (status == 0)
|
||||
intf->dev.power.power_state.event = PM_EVENT_ON;
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
|
@ -100,11 +100,13 @@ static inline int is_usb_device_driver(struct device_driver *drv)
|
|||
static inline void mark_active(struct usb_interface *f)
|
||||
{
|
||||
f->is_active = 1;
|
||||
f->dev.power.power_state.event = PM_EVENT_ON;
|
||||
}
|
||||
|
||||
static inline void mark_quiesced(struct usb_interface *f)
|
||||
{
|
||||
f->is_active = 0;
|
||||
f->dev.power.power_state.event = PM_EVENT_SUSPEND;
|
||||
}
|
||||
|
||||
static inline int is_active(const struct usb_interface *f)
|
||||
|
|
Loading…
Reference in a new issue