diff options
Diffstat (limited to 'drivers/scsi/dpt_i2o.c')
-rw-r--r-- | drivers/scsi/dpt_i2o.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index cdeb30b0462e..6e6b293dcb28 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c | |||
@@ -899,6 +899,12 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev | |||
899 | if(pci_enable_device(pDev)) { | 899 | if(pci_enable_device(pDev)) { |
900 | return -EINVAL; | 900 | return -EINVAL; |
901 | } | 901 | } |
902 | |||
903 | if (pci_request_regions(pDev, "dpt_i2o")) { | ||
904 | PERROR("dpti: adpt_config_hba: pci request region failed\n"); | ||
905 | return -EINVAL; | ||
906 | } | ||
907 | |||
902 | pci_set_master(pDev); | 908 | pci_set_master(pDev); |
903 | if (pci_set_dma_mask(pDev, 0xffffffffffffffffULL) && | 909 | if (pci_set_dma_mask(pDev, 0xffffffffffffffffULL) && |
904 | pci_set_dma_mask(pDev, 0xffffffffULL)) | 910 | pci_set_dma_mask(pDev, 0xffffffffULL)) |
@@ -924,10 +930,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev | |||
924 | raptorFlag = TRUE; | 930 | raptorFlag = TRUE; |
925 | } | 931 | } |
926 | 932 | ||
927 | if (pci_request_regions(pDev, "dpt_i2o")) { | ||
928 | PERROR("dpti: adpt_config_hba: pci request region failed\n"); | ||
929 | return -EINVAL; | ||
930 | } | ||
931 | base_addr_virt = ioremap(base_addr0_phys,hba_map0_area_size); | 933 | base_addr_virt = ioremap(base_addr0_phys,hba_map0_area_size); |
932 | if (!base_addr_virt) { | 934 | if (!base_addr_virt) { |
933 | pci_release_regions(pDev); | 935 | pci_release_regions(pDev); |