diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-08-19 07:20:14 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-09-03 13:29:56 +0100 |
| commit | 1765697321bcef9e36377aa079afb578253a3343 (patch) | |
| tree | fbc5828ab2d19a5023b6368dafe5a65d81a07b06 | |
| parent | 00ed6693abfea1c45f846f7610eac63225f70ac1 (diff) | |
| download | linux-stable-1765697321bcef9e36377aa079afb578253a3343.tar.gz linux-stable-1765697321bcef9e36377aa079afb578253a3343.tar.bz2 linux-stable-1765697321bcef9e36377aa079afb578253a3343.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: Luis Henriques <luis.henriques@canonical.com>
| -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 8df7e1d14603..34f934095ddd 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -663,7 +663,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); |