lkml.org 
[lkml]   [2021]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 029/363] ALSA: hdsp: dont disable if not enabled
    Date
    From: Tong Zhang <ztong0001@gmail.com>

    [ Upstream commit 507cdb9adba006a7798c358456426e1aea3d9c4f ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/pci/rme9652/hdsp.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
    index 4cf879c42dc4..720297cbdf87 100644
    --- a/sound/pci/rme9652/hdsp.c
    +++ b/sound/pci/rme9652/hdsp.c
    @@ -5390,7 +5390,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;
    }

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-17 16:10    [W:3.603 / U:1.696 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site