diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-10-17 10:50:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-10-17 10:52:06 +0200 |
| commit | 0011a33f097dd97d09a1ebd32c5d8df0be7ac04a (patch) | |
| tree | 706b30408893852c5d2f8ef3317ab17d407dcdea /sound/usb/line6/driver.c | |
| parent | 49815404bd3870232de8800430a83d7d498ae1e2 (diff) | |
| parent | 99fee508245825765ff60155fed43f970ff83a8f (diff) | |
| download | linux-0011a33f097dd97d09a1ebd32c5d8df0be7ac04a.tar.bz2 | |
Merge branch 'for-linus' into for-next
Back-merge for applying the timer API conversion patch for line6
driver that conflicts with the recent fix in upstream.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/line6/driver.c')
| -rw-r--r-- | sound/usb/line6/driver.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 7c682b219584..8d5a454842f4 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -793,9 +793,10 @@ int line6_probe(struct usb_interface *interface, return 0; error: - if (line6->disconnect) - line6->disconnect(line6); - snd_card_free(card); + /* we can call disconnect callback here because no close-sync is + * needed yet at this point + */ + line6_disconnect(interface); return ret; } EXPORT_SYMBOL_GPL(line6_probe); |