diff options
| author | Tejun Heo <tj@kernel.org> | 2016-05-09 12:34:39 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-05-09 12:34:39 -0400 |
| commit | 698f6700a6f19ba4550a722eaacf9f9d212b3fd9 (patch) | |
| tree | ff63c9a23fe47870df8788ff5e7d9a552f6d4ed1 /drivers/scsi/pm8001/pm8001_init.c | |
| parent | 7780081c1f04a4ea31331b5579ca010cc1f26c74 (diff) | |
| parent | 13f307711b127d30fcf333a04365a217baf9ca2b (diff) | |
Merge branch '4.7/scsi-queue' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi into for-4.7-zac
Pulling in the dependencies for further ZAC changes.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/scsi/pm8001/pm8001_init.c')
| -rw-r--r-- | drivers/scsi/pm8001/pm8001_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 062ab34b86f8..6bd7bf4f4a81 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -418,8 +418,6 @@ static int pm8001_ioremap(struct pm8001_hba_info *pm8001_ha) if (pci_resource_flags(pdev, bar) & IORESOURCE_MEM) { pm8001_ha->io_mem[logicalBar].membase = pci_resource_start(pdev, bar); - pm8001_ha->io_mem[logicalBar].membase &= - (u32)PCI_BASE_ADDRESS_MEM_MASK; pm8001_ha->io_mem[logicalBar].memsize = pci_resource_len(pdev, bar); pm8001_ha->io_mem[logicalBar].memvirtaddr = |