Commit 9003ebb1 authored Aug 19, 2015 by Takashi Iwai

ALSA: usb-audio: Fix runtime PM unbalance



The fix for deadlock in PM in commit [1ee23fe0: 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: 1ee23fe0 ('ALSA: usb-audio: Fix deadlocks at resuming')
Cc: <stable@vger.kernel.org> [v3.15+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 7ccb0a99

sound/usb/card.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -638,7 +638,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);

Admin message