From 0fd74ac094142a136e8fad0580bef003ffdd1349 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 4 May 2007 11:49:57 -0400 Subject: [PATCH] --- yaml --- r: 59380 b: refs/heads/master c: 784a6e1cc406b7ef48476a1f38b83fc551f5616f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/driver.c | 4 ---- trunk/drivers/usb/core/usb.h | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 749877a5414b..91b59749ab82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6ace2c99afefb7969ccccba2fb413ad29ab2e2e +refs/heads/master: 784a6e1cc406b7ef48476a1f38b83fc551f5616f diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index 2619986e5300..38c3dd2a44e0 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/drivers/usb/core/driver.c @@ -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; } diff --git a/trunk/drivers/usb/core/usb.h b/trunk/drivers/usb/core/usb.h index bf2eb0dae2ec..6f361df374fc 100644 --- a/trunk/drivers/usb/core/usb.h +++ b/trunk/drivers/usb/core/usb.h @@ -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)