lkml.org 
[lkml]   [2011]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [84/99] USB: don't let errors prevent system sleep
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Alan Stern <stern@rowland.harvard.edu>

    commit 0af212ba8f123c2eba151af7726c34a50b127962 upstream.

    This patch (as1464) implements the recommended policy that most errors
    during suspend or hibernation should not prevent the system from going
    to sleep. In particular, failure to suspend a USB driver or a USB
    device should not prevent the sleep from succeeding:

    Failure to suspend a device won't matter, because the device will
    automatically go into suspend mode when the USB bus stops carrying
    packets. (This might be less true for USB-3.0 devices, but let's not
    worry about them now.)

    Failure of a driver to suspend might lead to trouble later on when the
    system wakes up, but it isn't sufficient reason to prevent the system
    from going to sleep.

    Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    drivers/usb/core/driver.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    Index: linux-2.6.35.y/drivers/usb/core/driver.c
    ===================================================================
    --- linux-2.6.35.y.orig/drivers/usb/core/driver.c
    +++ linux-2.6.35.y/drivers/usb/core/driver.c
    @@ -1189,13 +1189,22 @@ static int usb_suspend_both(struct usb_d
    for (i = n - 1; i >= 0; --i) {
    intf = udev->actconfig->interface[i];
    status = usb_suspend_interface(udev, intf, msg);
    +
    + /* Ignore errors during system sleep transitions */
    + if (!(msg.event & PM_EVENT_AUTO))
    + status = 0;
    if (status != 0)
    break;
    }
    }
    - if (status == 0)
    + if (status == 0) {
    status = usb_suspend_device(udev, msg);

    + /* Again, ignore errors during system sleep transitions */
    + if (!(msg.event & PM_EVENT_AUTO))
    + status = 0;
    + }
    +
    /* If the suspend failed, resume interfaces that did get suspended */
    if (status != 0) {
    msg.event ^= (PM_EVENT_SUSPEND | PM_EVENT_RESUME);

    \
     
     \ /
      Last update: 2011-07-27 23:53    [W:4.143 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site