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]
Signed-off-by: Tong Zhang <ztong0001@xxxxxxxxx>
---
sound/pci/rme9652/hdspm.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index 8d900c132f0f..af3898c88bba 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -6582,8 +6582,10 @@ static int snd_hdspm_create(struct snd_card *card,
pci_set_master(hdspm->pci);
err = pci_request_regions(pci, "hdspm");
- if (err < 0)
+ if (err < 0) {
+ pci_disable_device(pci);
return err;
+ }
hdspm->port = pci_resource_start(pci, 0);
io_extent = pci_resource_len(pci, 0);
@@ -6880,10 +6882,10 @@ static int snd_hdspm_free(struct hdspm * hdspm)
kfree(hdspm->mixer);
iounmap(hdspm->iobase);
- if (hdspm->port)
+ if (hdspm->port) {
pci_release_regions(hdspm->pci);
-
- pci_disable_device(hdspm->pci);
+ pci_disable_device(hdspm->pci);
+ }
return 0;
}
--
2.25.1
