projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| a82817d0 GKH |
1 | From f0730924e9e32bb8935c60040a26d94179355088 Mon Sep 17 00:00:00 2001 |
| 2 | From: Oliver Neukum <oliver@neukum.org> | |
| 3 | Date: Wed, 3 Mar 2010 00:37:56 +0100 | |
| 4 | Subject: USB: cdc-acm: Fix stupid NULL pointer in resume() | |
| 5 | ||
| 6 | From: Oliver Neukum <oliver@neukum.org> | |
| 7 | ||
| 8 | commit f0730924e9e32bb8935c60040a26d94179355088 upstream. | |
| 9 | ||
| 10 | Stupid logic bug passing a just nulled pointer | |
| 11 | ||
| 12 | Signed-off-by: Oliver Neukum <neukum@b1-systems.de> | |
| 13 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 14 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 15 | ||
| 16 | --- | |
| 17 | drivers/usb/class/cdc-acm.c | 2 +- | |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 19 | ||
| 20 | --- a/drivers/usb/class/cdc-acm.c | |
| 21 | +++ b/drivers/usb/class/cdc-acm.c | |
| 22 | @@ -1441,7 +1441,7 @@ static int acm_resume(struct usb_interfa | |
| 23 | wb = acm->delayed_wb; | |
| 24 | acm->delayed_wb = NULL; | |
| 25 | spin_unlock_irq(&acm->write_lock); | |
| 26 | - acm_start_wb(acm, acm->delayed_wb); | |
| 27 | + acm_start_wb(acm, wb); | |
| 28 | } else { | |
| 29 | spin_unlock_irq(&acm->write_lock); | |
| 30 | } |