diff options
| -rw-r--r-- | drivers/ata/ahci.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 14f1e9506338..c0ed4f273cf2 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -1238,15 +1238,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1238 | if (rc) | 1238 | if (rc) |
| 1239 | return rc; | 1239 | return rc; |
| 1240 | 1240 | ||
| 1241 | /* AHCI controllers often implement SFF compatible interface. | ||
| 1242 | * Grab all PCI BARs just in case. | ||
| 1243 | */ | ||
| 1244 | rc = pcim_iomap_regions_request_all(pdev, 1 << ahci_pci_bar, DRV_NAME); | ||
| 1245 | if (rc == -EBUSY) | ||
| 1246 | pcim_pin_device(pdev); | ||
| 1247 | if (rc) | ||
| 1248 | return rc; | ||
| 1249 | |||
| 1250 | if (pdev->vendor == PCI_VENDOR_ID_INTEL && | 1241 | if (pdev->vendor == PCI_VENDOR_ID_INTEL && |
| 1251 | (pdev->device == 0x2652 || pdev->device == 0x2653)) { | 1242 | (pdev->device == 0x2652 || pdev->device == 0x2653)) { |
| 1252 | u8 map; | 1243 | u8 map; |
| @@ -1263,6 +1254,15 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1263 | } | 1254 | } |
| 1264 | } | 1255 | } |
| 1265 | 1256 | ||
| 1257 | /* AHCI controllers often implement SFF compatible interface. | ||
| 1258 | * Grab all PCI BARs just in case. | ||
| 1259 | */ | ||
| 1260 | rc = pcim_iomap_regions_request_all(pdev, 1 << ahci_pci_bar, DRV_NAME); | ||
| 1261 | if (rc == -EBUSY) | ||
| 1262 | pcim_pin_device(pdev); | ||
| 1263 | if (rc) | ||
| 1264 | return rc; | ||
| 1265 | |||
| 1266 | hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); | 1266 | hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); |
| 1267 | if (!hpriv) | 1267 | if (!hpriv) |
| 1268 | return -ENOMEM; | 1268 | return -ENOMEM; |
