diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2015-01-20 09:58:54 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-28 07:19:29 +0100 |
| commit | 2a324fcdb568f4d7b0b65b271039beb987f6e1cd (patch) | |
| tree | bcef41067ca5ad1729e279bc31433664e76f1fc3 | |
| parent | ALSA: line6: Yet more cleanup of superfluous NULL checks (diff) | |
| download | linux-dev-2a324fcdb568f4d7b0b65b271039beb987f6e1cd.tar.xz linux-dev-2a324fcdb568f4d7b0b65b271039beb987f6e1cd.zip | |
ALSA: line6: Abort if inconsistent usbdev is found at disconnect
It's utterly unsafe to proceed further the disconnect procedure if the
assigned usbdev is inconsistent with the expected object. Better to
put a WARN_ON() for more cautions and abort immediately.
Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/usb/line6/driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index e8d51381ffdb..625272fe227a 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -585,12 +585,12 @@ void line6_disconnect(struct usb_interface *interface) if (!line6) return; + if (WARN_ON(usbdev != line6->usbdev)) + return; + if (line6->urb_listen != NULL) line6_stop_listen(line6); - if (usbdev != line6->usbdev) - dev_err(line6->ifcdev, "driver bug: inconsistent usb device\n"); - snd_card_disconnect(line6->card); if (line6->line6pcm) line6_pcm_disconnect(line6->line6pcm); |