From: Hugh Dickins <hugh@veritas.com>
Date: Thu, 5 Jun 2008 13:44:39 +0000 (+0100)
Subject: libata: fix G5 SATA broken on -rc5
X-Git-Tag: v2.6.26-rc6~105
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6311c90a9ea16b4ab93ed48f1a9022647f6b3c43;p=linux-2.6

libata: fix G5 SATA broken on -rc5

Fix G5 SATA irq 18: nobody cared, reported on -rc5 by Olaf Hering:
fixlet to a57c1bade5a0ee5cd8b74502db9cbebb7f5780b2 libata-sff:
Fix oops reported in kerneloops.org for pnp devices with no ctl

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Tested-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 90d20c615e..215d18672a 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -278,7 +278,7 @@ static u8 ata_sff_irq_status(struct ata_port *ap)
 		    	return status;
 	}
 	/* Clear INTRQ latch */
-	status = ata_sff_check_status(ap);
+	status = ap->ops->sff_check_status(ap);
 	return status;
 }