[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <CADuEq9BQX2BFBY3pF=CEEymfK4JPwMP7By+JZFdaLqxs+GhtJQ@mail.gmail.com>
Date: Tue, 5 Jul 2011 20:35:05 -0500
From: Chris Fries <qcf001@...orola.com>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org, stable@...nel.org
Subject: [PATCH] usb: usbnet: suspend count gets lost when -EBUSY
When suspend is refused due to pending transmits, the
busy counter gets out of sync, and suspend will stop
working correctly.
Signed-off-by: Chris Fries <C.Fries@...orola.com>
---
drivers/net/usb/usbnet.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index cc95aad..9bcc3e3 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1451,6 +1451,7 @@ int usbnet_suspend (struct usb_interface *intf,
pm_message_t message)
/* don't autosuspend while transmitting */
if (dev->txq.qlen && (message.event & PM_EVENT_AUTO)) {
spin_unlock_irq(&dev->txq.lock);
+ dev->suspend_count--;
return -EBUSY;
} else {
set_bit(EVENT_DEV_ASLEEP, &dev->flags);
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists