From 5cba7433fb2b5aca588c1065cdd7de80cd978828 Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Thu, 20 Sep 2007 12:37:50 -0400 Subject: [PATCH] --- yaml --- r: 67900 b: refs/heads/master c: 7108f28465a0a37d5afc05c5ad788938423b74a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/driver.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index da41ce7db16a..119ec87fe666 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 393e5511a5f58e82b88589f1dd2464f6b661df06 +refs/heads/master: 7108f28465a0a37d5afc05c5ad788938423b74a7 diff --git a/trunk/drivers/usb/core/driver.c b/trunk/drivers/usb/core/driver.c index ba5bbc7eedcc..3f734240e0ec 100644 --- a/trunk/drivers/usb/core/driver.c +++ b/trunk/drivers/usb/core/driver.c @@ -1112,7 +1112,12 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) usb_hcd_flush_endpoint(udev, udev->ep_out[i]); usb_hcd_flush_endpoint(udev, udev->ep_in[i]); } - if (parent) + + /* If this is just a FREEZE or a PRETHAW, udev might + * not really be suspended. Only true suspends get + * propagated up the device tree. + */ + if (parent && udev->state == USB_STATE_SUSPENDED) usb_autosuspend_device(parent); }