lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 483/530] scsi: 3w-9xxx: Avoid disabling device if failing to enable it
    Date
    From: Letu Ren <fantasquex@gmail.com>

    [ Upstream commit 7eff437b5ee1309b34667844361c6bbb5c97df05 ]

    The original code will "goto out_disable_device" and call
    pci_disable_device() if pci_enable_device() fails. The kernel will generate
    a warning message like "3w-9xxx 0000:00:05.0: disabling already-disabled
    device".

    We shouldn't disable a device that failed to be enabled. A simple return is
    fine.

    Link: https://lore.kernel.org/r/20220829110115.38789-1-fantasquex@gmail.com
    Reported-by: Zheyu Ma <zheyuma97@gmail.com>
    Signed-off-by: Letu Ren <fantasquex@gmail.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/3w-9xxx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c
    index e41cc354cc8a..6da591508f23 100644
    --- a/drivers/scsi/3w-9xxx.c
    +++ b/drivers/scsi/3w-9xxx.c
    @@ -2006,7 +2006,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
    retval = pci_enable_device(pdev);
    if (retval) {
    TW_PRINTK(host, TW_DRIVER, 0x34, "Failed to enable pci device");
    - goto out_disable_device;
    + return -ENODEV;
    }

    pci_set_master(pdev);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 18:59    [W:4.543 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site