diff options
| author | Ming Lei <ming.lei@canonical.com> | 2012-06-19 21:15:52 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-22 17:34:17 -0700 |
| commit | 5eeb3132eb4c5e9ca92e5247fe4575fe9f8c3efe (patch) | |
| tree | 3634dc8b320544ca8e567a9899f480172a0f19a3 | |
| parent | fb13c47b8e5ce707268bd38cfd082da377eac4b7 (diff) | |
| download | infiniband-5eeb3132eb4c5e9ca92e5247fe4575fe9f8c3efe.tar.gz | |
usbnet: decrease suspend count if returning -EBUSY for runtime suspend
This patch decreases dev->suspend_count in the -EBUSY failure path
of usbnet_suspend. Without the change, the later runtime suspend
will do nothing except for increasing dev->suspend_count.
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Acked-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | 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 815493caea7f5..1e46f693eb47e 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1515,6 +1515,7 @@ int usbnet_suspend (struct usb_interface *intf, pm_message_t message) spin_lock_irq(&dev->txq.lock); /* don't autosuspend while transmitting */ if (dev->txq.qlen && PMSG_IS_AUTO(message)) { + dev->suspend_count--; spin_unlock_irq(&dev->txq.lock); return -EBUSY; } else { |