diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-21 09:33:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-21 09:33:25 +0100 |
| commit | 93929ebc813e2bbb768676ed13a1661893631504 (patch) | |
| tree | b22e6e45ea149e02d2fbe2e29b38db0bfa98f32b /drivers/usb/class/cdc-acm.c | |
| parent | ALSA: hda - Add alc_codec_rename() helper (diff) | |
| parent | ALSA: hda - Add PCI quirk for HP dv6-1110ax. (diff) | |
| download | linux-93929ebc813e2bbb768676ed13a1661893631504.tar.xz linux-93929ebc813e2bbb768676ed13a1661893631504.zip | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 |
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); } |