From 790f5719b85e12e10c41753b864e74249585ed08 Mon Sep 17 00:00:00 2001

From: Tong Zhang <ztong0001@gmail.com>

Date: Sun, 21 Mar 2021 11:38:39 -0400

Subject: [PATCH] ALSA: hdspm: don't disable if not enabled

Git-commit: 790f5719b85e12e10c41753b864e74249585ed08

Patch-mainline: v5.13-rc1

References: git-fixes

hdspm wants to disable a not enabled pci device, which makes kernel

throw a warning. Make sure the device is enabled before calling disable.

[    1.786391] snd_hdspm 0000:00:03.0: disabling already-disabled device

[    1.786400] WARNING: CPU: 0 PID: 182 at drivers/pci/pci.c:2146 pci_disable_device+0x91/0xb0

[    1.795181] Call Trace:

[    1.795320]  snd_hdspm_card_free+0x58/0xa0 [snd_hdspm]

[    1.795595]  release_card_device+0x4b/0x80 [snd]

[    1.795860]  device_release+0x3b/0xa0

[    1.796072]  kobject_put+0x94/0x1b0

[    1.796260]  put_device+0x13/0x20

[    1.796438]  snd_card_free+0x61/0x90 [snd]

[    1.796659]  snd_hdspm_probe+0x97b/0x1440 [snd_hdspm]

Suggested-by: Takashi Iwai <tiwai@suse.de>

Signed-off-by: Tong Zhang <ztong0001@gmail.com>

Link: https://lore.kernel.org/r/20210321153840.378226-3-ztong0001@gmail.com

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 sound/pci/rme9652/hdspm.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c

index b66711574b1a..6edc31b44b22 100644

--- a/sound/pci/rme9652/hdspm.c

+++ b/sound/pci/rme9652/hdspm.c

@@ -6884,7 +6884,8 @@ static int snd_hdspm_free(struct hdspm * hdspm)

 	if (hdspm->port)

 		pci_release_regions(hdspm->pci);

-	pci_disable_device(hdspm->pci);

+	if (pci_is_enabled(hdspm->pci))

+		pci_disable_device(hdspm->pci);

 	return 0;

 }

-- 

2.26.2