diff options
Diffstat (limited to 'drivers/scsi/aacraid/linit.c')
-rw-r--r-- | drivers/scsi/aacraid/linit.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c index 6e4eafa4ecee..359e7ddfdb47 100644 --- a/drivers/scsi/aacraid/linit.c +++ b/drivers/scsi/aacraid/linit.c | |||
@@ -867,13 +867,6 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
867 | * Map in the registers from the adapter. | 867 | * Map in the registers from the adapter. |
868 | */ | 868 | */ |
869 | aac->base_size = AAC_MIN_FOOTPRINT_SIZE; | 869 | aac->base_size = AAC_MIN_FOOTPRINT_SIZE; |
870 | if ((aac->regs.sa = ioremap( | ||
871 | (unsigned long)aac->scsi_host_ptr->base, AAC_MIN_FOOTPRINT_SIZE)) | ||
872 | == NULL) { | ||
873 | printk(KERN_WARNING "%s: unable to map adapter.\n", | ||
874 | AAC_DRIVERNAME); | ||
875 | goto out_free_fibs; | ||
876 | } | ||
877 | if ((*aac_drivers[index].init)(aac)) | 870 | if ((*aac_drivers[index].init)(aac)) |
878 | goto out_unmap; | 871 | goto out_unmap; |
879 | 872 | ||
@@ -972,8 +965,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, | |||
972 | aac_fib_map_free(aac); | 965 | aac_fib_map_free(aac); |
973 | pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys); | 966 | pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys); |
974 | kfree(aac->queues); | 967 | kfree(aac->queues); |
975 | iounmap(aac->regs.sa); | 968 | aac_adapter_ioremap(aac, 0); |
976 | out_free_fibs: | ||
977 | kfree(aac->fibs); | 969 | kfree(aac->fibs); |
978 | kfree(aac->fsa_dev); | 970 | kfree(aac->fsa_dev); |
979 | out_free_host: | 971 | out_free_host: |
@@ -1008,7 +1000,7 @@ static void __devexit aac_remove_one(struct pci_dev *pdev) | |||
1008 | kfree(aac->queues); | 1000 | kfree(aac->queues); |
1009 | 1001 | ||
1010 | free_irq(pdev->irq, aac); | 1002 | free_irq(pdev->irq, aac); |
1011 | iounmap(aac->regs.sa); | 1003 | aac_adapter_ioremap(aac, 0); |
1012 | 1004 | ||
1013 | kfree(aac->fibs); | 1005 | kfree(aac->fibs); |
1014 | kfree(aac->fsa_dev); | 1006 | kfree(aac->fsa_dev); |