OSDN Git Service

staging: rts5208: add missed pci_release_regions
authorChuhong Yuan <hslester96@gmail.com>
Fri, 6 Dec 2019 07:55:15 +0000 (15:55 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 10 Dec 2019 09:34:42 +0000 (10:34 +0100)
The driver forgets to call pci_release_regions() in probe failure
and remove.
Add the missed calls to fix it.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20191206075515.18581-1-hslester96@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rts5208/rtsx.c

index cb95ad6..15fc96b 100644 (file)
@@ -831,7 +831,8 @@ static int rtsx_probe(struct pci_dev *pci,
        host = scsi_host_alloc(&rtsx_host_template, sizeof(*dev));
        if (!host) {
                dev_err(&pci->dev, "Unable to allocate the scsi host\n");
-               return -ENOMEM;
+               err = -ENOMEM;
+               goto scsi_host_alloc_fail;
        }
 
        dev = host_to_rtsx(host);
@@ -971,7 +972,8 @@ ioremap_fail:
        kfree(dev->chip);
 chip_alloc_fail:
        dev_err(&pci->dev, "%s failed\n", __func__);
-
+scsi_host_alloc_fail:
+       pci_release_regions(pci);
        return err;
 }
 
@@ -983,6 +985,7 @@ static void rtsx_remove(struct pci_dev *pci)
 
        quiesce_and_remove_host(dev);
        release_everything(dev);
+       pci_release_regions(pci);
 }
 
 /* PCI IDs */