aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c4
-rw-r--r--drivers/ata/sata_vsc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 7f77c67d267c..5b0295a923a7 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2240,7 +2240,7 @@ int ata_dev_configure(struct ata_device *dev)
2240 if (id[ATA_ID_CFA_KEY_MGMT] & 1) 2240 if (id[ATA_ID_CFA_KEY_MGMT] & 1)
2241 ata_dev_printk(dev, KERN_WARNING, 2241 ata_dev_printk(dev, KERN_WARNING,
2242 "supports DRM functions and may " 2242 "supports DRM functions and may "
2243 "not be fully accessable.\n"); 2243 "not be fully accessible.\n");
2244 snprintf(revbuf, 7, "CFA"); 2244 snprintf(revbuf, 7, "CFA");
2245 } else { 2245 } else {
2246 snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id)); 2246 snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id));
@@ -2248,7 +2248,7 @@ int ata_dev_configure(struct ata_device *dev)
2248 if (ata_id_has_tpm(id)) 2248 if (ata_id_has_tpm(id))
2249 ata_dev_printk(dev, KERN_WARNING, 2249 ata_dev_printk(dev, KERN_WARNING,
2250 "supports DRM functions and may " 2250 "supports DRM functions and may "
2251 "not be fully accessable.\n"); 2251 "not be fully accessible.\n");
2252 } 2252 }
2253 2253
2254 dev->n_sectors = ata_id_n_sectors(id); 2254 dev->n_sectors = ata_id_n_sectors(id);
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index b777176ff494..e079cf29ed5d 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -370,7 +370,7 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev,
370 if (pci_resource_len(pdev, 0) == 0) 370 if (pci_resource_len(pdev, 0) == 0)
371 return -ENODEV; 371 return -ENODEV;
372 372
373 /* map IO regions and intialize host accordingly */ 373 /* map IO regions and initialize host accordingly */
374 rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME); 374 rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME);
375 if (rc == -EBUSY) 375 if (rc == -EBUSY)
376 pcim_pin_device(pdev); 376 pcim_pin_device(pdev);