diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2021-04-06 04:57:29 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-04-06 04:57:29 +0200 |
| commit | 556666bce111b2a758010c2a2a6bab7f3770f4de (patch) | |
| tree | 3a35ea6f9a9aa43b82166afc1f329084dd55c729 /drivers/scsi/myrs.c | |
| parent | scsi: message: mptlan: Replace one-element array with flexible-array member (diff) | |
| parent | scsi: iscsi: Fix race condition between login and sync thread (diff) | |
| download | linux-556666bce111b2a758010c2a2a6bab7f3770f4de.tar.xz linux-556666bce111b2a758010c2a2a6bab7f3770f4de.zip | |
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging
Pull 5.12/scsi-fixes into the 5.13 SCSI tree to provide a baseline for
some UFS changes that would otherwise cause conflicts during the
merge.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/myrs.c')
| -rw-r--r-- | drivers/scsi/myrs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c index 3d55208db3ba..d5ec1cdea0e1 100644 --- a/drivers/scsi/myrs.c +++ b/drivers/scsi/myrs.c @@ -2271,12 +2271,12 @@ static void myrs_cleanup(struct myrs_hba *cs) if (cs->mmio_base) { cs->disable_intr(cs); iounmap(cs->mmio_base); + cs->mmio_base = NULL; } if (cs->irq) free_irq(cs->irq, cs); if (cs->io_addr) release_region(cs->io_addr, 0x80); - iounmap(cs->mmio_base); pci_set_drvdata(pdev, NULL); pci_disable_device(pdev); scsi_host_put(cs->host); |