diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-18 08:56:47 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-18 08:56:47 -0800 |
commit | c1717701be2f0639e5f817385a524131dbd3ff38 (patch) | |
tree | 5cfa7189a4f91bb931efe57fcfdb87a9b2b8a65f /sound/usb | |
parent | bd2bc2b8e63f872f8aa0f3536a40ffce6e1840bb (diff) | |
parent | 6ff1a25318ebf688ef9593fe09cd449f6fb4ad31 (diff) | |
download | op-kernel-dev-c1717701be2f0639e5f817385a524131dbd3ff38.zip op-kernel-dev-c1717701be2f0639e5f817385a524131dbd3ff38.tar.gz |
Merge tag 'sound-4.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Three trivial fixes:
A regression fix for ASRock mobo, a use-after-free fix at hot-unplug
of USB-audio, and a quirk for new Thinkpad models"
* tag 'sound-4.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: usb-audio: Fix use-after-free of usb_device at disconnect
ALSA: hda - Fix mic regression by ASRock mobo fixup
ALSA: hda - add a new condition to check if it is thinkpad
Diffstat (limited to 'sound/usb')
-rw-r--r-- | sound/usb/card.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 9e5276d6..2ddc034 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -315,7 +315,8 @@ static int snd_usb_audio_free(struct snd_usb_audio *chip) snd_usb_endpoint_free(ep); mutex_destroy(&chip->mutex); - dev_set_drvdata(&chip->dev->dev, NULL); + if (!atomic_read(&chip->shutdown)) + dev_set_drvdata(&chip->dev->dev, NULL); kfree(chip); return 0; } |