diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2007-10-02 16:53:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-03 14:43:27 -0400 |
| commit | 90925d3050253ff7b4f5d1660071df75f44bd0ff (patch) | |
| tree | f9a7f090d868dabdd8fd796c2b7bf6ace1d945b0 /drivers/ata | |
| parent | 4007b493ee6e4a52c2b618ab8361847fba5bf116 (diff) | |
Ata: pata_marvell, use ioread* for iomap-ped memory
pata_marvell, use ioread* for iomap-ped memory
read* on pci_iomapped memory is incorrect, fix it
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_marvell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c index ae206f35f747..b45506f1ef73 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c | |||
| @@ -44,10 +44,10 @@ static int marvell_pre_reset(struct ata_port *ap, unsigned long deadline) | |||
| 44 | return -ENOMEM; | 44 | return -ENOMEM; |
| 45 | printk("BAR5:"); | 45 | printk("BAR5:"); |
| 46 | for(i = 0; i <= 0x0F; i++) | 46 | for(i = 0; i <= 0x0F; i++) |
| 47 | printk("%02X:%02X ", i, readb(barp + i)); | 47 | printk("%02X:%02X ", i, ioread8(barp + i)); |
| 48 | printk("\n"); | 48 | printk("\n"); |
| 49 | 49 | ||
| 50 | devices = readl(barp + 0x0C); | 50 | devices = ioread32(barp + 0x0C); |
| 51 | pci_iounmap(pdev, barp); | 51 | pci_iounmap(pdev, barp); |
| 52 | 52 | ||
| 53 | if ((pdev->device == 0x6145) && (ap->port_no == 0) && | 53 | if ((pdev->device == 0x6145) && (ap->port_no == 0) && |