ALSA: hdsp: don't disable if not enabled
authorTong Zhang <ztong0001@gmail.com>
Sun, 21 Mar 2021 15:38:38 +0000 (11:38 -0400)
committerTakashi Iwai <tiwai@suse.de>
Mon, 22 Mar 2021 11:20:44 +0000 (12:20 +0100)
hdsp wants to disable a not enabled pci device, which makes kernel
throw a warning. Make sure the device is enabled before calling disable.

[    1.758292] snd_hdsp 0000:00:03.0: disabling already-disabled device
[    1.758327] WARNING: CPU: 0 PID: 180 at drivers/pci/pci.c:2146 pci_disable_device+0x91/0xb0
[    1.766985] Call Trace:
[    1.767121]  snd_hdsp_card_free+0x94/0xf0 [snd_hdsp]
[    1.767388]  release_card_device+0x4b/0x80 [snd]
[    1.767639]  device_release+0x3b/0xa0
[    1.767838]  kobject_put+0x94/0x1b0
[    1.768027]  put_device+0x13/0x20
[    1.768207]  snd_card_free+0x61/0x90 [snd]
[    1.768430]  snd_hdsp_probe+0x524/0x5e0 [snd_hdsp]

Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Link: https://lore.kernel.org/r/20210321153840.378226-2-ztong0001@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/rme9652/hdsp.c

index 6d90293..ab9a32a 100644 (file)
@@ -5393,7 +5393,8 @@ static int snd_hdsp_free(struct hdsp *hdsp)
        if (hdsp->port)
                pci_release_regions(hdsp->pci);
 
-       pci_disable_device(hdsp->pci);
+       if (pci_is_enabled(hdsp->pci))
+               pci_disable_device(hdsp->pci);
        return 0;
 }