Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b128f2fd authored by Takashi Iwai's avatar Takashi Iwai Committed by Hemant Kumar
Browse files

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: default avatarHans Yang <hansy@nvidia.com>
Fixes: 1ee23fe0 ('ALSA: usb-audio: Fix deadlocks at resuming')
Cc: <stable@vger.kernel.org> [v3.15+]
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Git-commit: 9003ebb13f61e8c78a641e0dda7775183ada0625
Git-repo: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git


[hemantk@codeaurora.org: merging with msm-specific changes]
CRs-Fixed: 1003807
Change-Id: Iff62dc24c72746fa0dfafde5cba0e15f368050da
Signed-off-by: default avatarHemant Kumar <hemantk@codeaurora.org>
parent e551e7a6

sound/usb/card.c

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