Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / staging / rts5208 / rtsx.c

diff --git a/drivers/staging/rts5208/rtsx.c b/drivers/staging/rts5208/rtsx.c
index fbb42e5..be0053c 100644 (file)
--- a/drivers/staging/rts5208/rtsx.c
+++ b/drivers/staging/rts5208/rtsx.c
@@ -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 */