From 150981b0306fc5773b929e31ab5b0590c87cc77c Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 23 Oct 2007 16:50:02 +0100 Subject: 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 Signed-off-by: Jeff Garzik --- drivers/ata/libata-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/ata') diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index b458639b473..0978b2feef9 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); -- cgit v1.2.3