diff options
| author | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:36 +1100 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2016-02-02 13:23:42 +1100 |
| commit | f3f4aeb9ea8954c0da3cf0d12693f9a57f1f4ac7 (patch) | |
| tree | 3663ab29736373c565d88e941162d37311cc3c75 /sound/usb/card.c | |
| parent | 2a3f5f14fdf2e8fb680af168fa642ef8a9218ffb (diff) | |
| parent | 849a2d3d9be31368559e6852cf64d749e6903818 (diff) | |
| download | talos-obmc-linux-openbmc-20160202-1.tar.gz talos-obmc-linux-openbmc-20160202-1.zip | |
Merge tag 'v4.3.5' into dev-4.3openbmc-20160202-1
This is the 4.3.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'sound/usb/card.c')
| -rw-r--r-- | sound/usb/card.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 18f56646ce86..1f09d9591276 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -675,6 +675,8 @@ int snd_usb_autoresume(struct snd_usb_audio *chip) void snd_usb_autosuspend(struct snd_usb_audio *chip) { + if (atomic_read(&chip->shutdown)) + return; if (atomic_dec_and_test(&chip->active)) usb_autopm_put_interface(chip->pm_intf); } |
