From c016a5f7281f5272adda50d5dd8a16247667a90c Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Fri, 4 May 2007 11:54:28 -0400 Subject: [PATCH] --- yaml --- r: 59384 b: refs/heads/master c: f3fd77cd2f4499f3e2ef9a1e6d5e4f4349d556c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hcd-pci.c | 3 ++- trunk/drivers/usb/storage/usb.c | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 382e73600f97..cba20581d26c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8adb4786789c25007f39b4d00dd03cc83bdcb896 +refs/heads/master: f3fd77cd2f4499f3e2ef9a1e6d5e4f4349d556c3 diff --git a/trunk/drivers/usb/core/hcd-pci.c b/trunk/drivers/usb/core/hcd-pci.c index edf4300a3f7a..5cf6d5f9acbd 100644 --- a/trunk/drivers/usb/core/hcd-pci.c +++ b/trunk/drivers/usb/core/hcd-pci.c @@ -207,7 +207,8 @@ int usb_hcd_pci_suspend (struct pci_dev *dev, pm_message_t message) * We must ignore the FREEZE vs SUSPEND distinction here, because * otherwise the swsusp will save (and restore) garbage state. */ - if (hcd->self.root_hub->dev.power.power_state.event == PM_EVENT_ON) + if (!(hcd->state == HC_STATE_SUSPENDED || + hcd->state == HC_STATE_HALT)) return -EBUSY; if (hcd->driver->suspend) { diff --git a/trunk/drivers/usb/storage/usb.c b/trunk/drivers/usb/storage/usb.c index 8e898e3d861e..df5dc186aef5 100644 --- a/trunk/drivers/usb/storage/usb.c +++ b/trunk/drivers/usb/storage/usb.c @@ -197,7 +197,6 @@ static int storage_suspend(struct usb_interface *iface, pm_message_t message) US_DEBUGP("%s\n", __FUNCTION__); if (us->suspend_resume_hook) (us->suspend_resume_hook)(us, US_SUSPEND); - iface->dev.power.power_state.event = message.event; /* When runtime PM is working, we'll set a flag to indicate * whether we should autoresume when a SCSI request arrives. */ @@ -215,7 +214,6 @@ static int storage_resume(struct usb_interface *iface) US_DEBUGP("%s\n", __FUNCTION__); if (us->suspend_resume_hook) (us->suspend_resume_hook)(us, US_RESUME); - iface->dev.power.power_state.event = PM_EVENT_ON; mutex_unlock(&us->dev_mutex); return 0;