diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-10-23 16:50:02 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-23 21:20:02 -0400 |
commit | 150981b0306fc5773b929e31ab5b0590c87cc77c (patch) | |
tree | f1d76250c05026d742c2a75538977fc1a7dcf3b8 | |
parent | 2dcb407e61458ded17503d6bd12b8c064965368b (diff) | |
download | lwn-150981b0306fc5773b929e31ab5b0590c87cc77c.tar.gz lwn-150981b0306fc5773b929e31ab5b0590c87cc77c.zip |
libata-core: auditting chk_status v check_status
Did a complete audit of these and found we have another error case.
ata_bus_softreset calls ata_check_status which means that it tries to do
an ioread8 on the port blindly and check versus 0xFF for an error.
It should of course be using the ap->ops method for this via chk_status,
and this bug causes a wrog status call on the NS87415 at least.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/ata/libata-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b458639b4735..0978b2feef99 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -3267,7 +3267,7 @@ static int ata_bus_softreset(struct ata_port *ap, unsigned int devmask, * the bus shows 0xFF because the odd clown forgets the D7 * pulldown resistor. */ - if (ata_check_status(ap) == 0xFF) + if (ata_chk_status(ap) == 0xFF) return -ENODEV; return ata_bus_post_reset(ap, devmask, deadline); |