summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2010-03-03 00:37:56 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-19 15:24:06 +0100
commitf0730924e9e32bb8935c60040a26d94179355088 (patch)
tree7e540978195273921f55ec087be792f87079de6b
parentUSB: EHCI: adjust ehci_iso_stream for changes in ehci_qh (diff)
downloadlinux-f0730924e9e32bb8935c60040a26d94179355088.tar.xz
linux-f0730924e9e32bb8935c60040a26d94179355088.zip
USB: cdc-acm: Fix stupid NULL pointer in resume()
Stupid logic bug passing a just nulled pointer Signed-off-by: Oliver Neukum <neukum@b1-systems.de> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/class/cdc-acm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 975d556b4787..be6331e2c276 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1441,7 +1441,7 @@ static int acm_resume(struct usb_interface *intf)
wb = acm->delayed_wb;
acm->delayed_wb = NULL;
spin_unlock_irq(&acm->write_lock);
- acm_start_wb(acm, acm->delayed_wb);
+ acm_start_wb(acm, wb);
} else {
spin_unlock_irq(&acm->write_lock);
}