diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-08-19 07:20:14 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-11-28 22:22:52 +0100 |
| commit | dbb41290b2033840bf962d987c575fb3c8e11807 (patch) | |
| tree | 1ca5dbb7dfc3a5d73f80f061d30158161fa21709 | |
| parent | 6417d6f2e707a0bcf5b4fd13c0b184d4ba41c4d0 (diff) | |
| download | lwn-dbb41290b2033840bf962d987c575fb3c8e11807.tar.gz lwn-dbb41290b2033840bf962d987c575fb3c8e11807.zip | |
ALSA: usb-audio: Fix runtime PM unbalance
commit 9003ebb13f61e8c78a641e0dda7775183ada0625 upstream.
The fix for deadlock in PM in commit [1ee23fe07ee8: ALSA: usb-audio:
Fix deadlocks at resuming] introduced a new check of in_pm flag.
However, the brainless patch author evaluated it in a wrong way
(logical AND instead of logical OR), thus usb_autopm_get_interface()
is wrongly called at probing, leading to unbalance of runtime PM
refcount.
This patch fixes it by correcting the logic.
Reported-by: Hans Yang <hansy@nvidia.com>
Fixes: 1ee23fe07ee8 ('ALSA: usb-audio: Fix deadlocks at resuming')
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | sound/usb/card.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index bc5795f342a7..96a09226be7d 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -661,7 +661,7 @@ int snd_usb_autoresume(struct snd_usb_audio *chip) int err = -ENODEV; down_read(&chip->shutdown_rwsem); - if (chip->probing && chip->in_pm) + if (chip->probing || chip->in_pm) err = 0; else if (!chip->shutdown) err = usb_autopm_get_interface(chip->pm_intf); |