git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
drivers
/
scsi
/
sata_promise.c
diff --git
a/drivers/scsi/sata_promise.c
b/drivers/scsi/sata_promise.c
index
b1d865e
..
25da626
100644
(file)
--- a/
drivers/scsi/sata_promise.c
+++ b/
drivers/scsi/sata_promise.c
@@
-412,7
+412,7
@@
static void pdc_pata_phy_reset(struct ata_port *ap)
static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
{
static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
{
- if (
sc_reg > SCR_CONTROL
)
+ if (
(sc_reg > SCR_CONTROL) || (ap->flags & ATA_FLAG_SLAVE_POSS)
)
return 0xffffffffU;
return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
}
return 0xffffffffU;
return readl((void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
}
@@
-421,7
+421,7
@@
static u32 pdc_sata_scr_read (struct ata_port *ap, unsigned int sc_reg)
static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
u32 val)
{
static void pdc_sata_scr_write (struct ata_port *ap, unsigned int sc_reg,
u32 val)
{
- if (
sc_reg > SCR_CONTROL
)
+ if (
(sc_reg > SCR_CONTROL) || (ap->flags & ATA_FLAG_SLAVE_POSS)
)
return;
writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
}
return;
writel(val, (void __iomem *) ap->ioaddr.scr_addr + (sc_reg * 4));
}