diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-13 17:29:07 -0400 |
| commit | f499cae1e59d75d5eb24c23d47cf8986e6032c6d (patch) | |
| tree | 1af6235c18391212c40116eb90b01eae8938efee /drivers/ata/sata_sil24.c | |
| parent | fc3f55e672e1ed917dd9e215af81939cd3d717da (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/sata_sil24.c')
| -rw-r--r-- | drivers/ata/sata_sil24.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 0d8990dcdfcd..77aa8d7ecec4 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
| @@ -1297,10 +1297,10 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1297 | host->iomap = iomap; | 1297 | host->iomap = iomap; |
| 1298 | 1298 | ||
| 1299 | /* configure and activate the device */ | 1299 | /* configure and activate the device */ |
| 1300 | if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { | 1300 | if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { |
| 1301 | rc = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK); | 1301 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); |
| 1302 | if (rc) { | 1302 | if (rc) { |
| 1303 | rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | 1303 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1304 | if (rc) { | 1304 | if (rc) { |
| 1305 | dev_printk(KERN_ERR, &pdev->dev, | 1305 | dev_printk(KERN_ERR, &pdev->dev, |
| 1306 | "64-bit DMA enable failed\n"); | 1306 | "64-bit DMA enable failed\n"); |
| @@ -1308,13 +1308,13 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
| 1308 | } | 1308 | } |
| 1309 | } | 1309 | } |
| 1310 | } else { | 1310 | } else { |
| 1311 | rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); | 1311 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1312 | if (rc) { | 1312 | if (rc) { |
| 1313 | dev_printk(KERN_ERR, &pdev->dev, | 1313 | dev_printk(KERN_ERR, &pdev->dev, |
| 1314 | "32-bit DMA enable failed\n"); | 1314 | "32-bit DMA enable failed\n"); |
| 1315 | return rc; | 1315 | return rc; |
| 1316 | } | 1316 | } |
| 1317 | rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); | 1317 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); |
| 1318 | if (rc) { | 1318 | if (rc) { |
| 1319 | dev_printk(KERN_ERR, &pdev->dev, | 1319 | dev_printk(KERN_ERR, &pdev->dev, |
| 1320 | "32-bit consistent DMA enable failed\n"); | 1320 | "32-bit consistent DMA enable failed\n"); |