From: Alan Cox Date: Tue, 23 Oct 2007 15:50:02 +0000 (+0100) Subject: libata-core: auditting chk_status v check_status X-Git-Tag: v2.6.24-rc1~16^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=150981b0306fc5773b929e31ab5b0590c87cc77c;p=linux.git 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 --- 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);