summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-sff.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 15:08:35 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-18 15:08:35 -0700
commit2af170dd241810212cbdbdc802ba7d39e3fb23b9 (patch)
tree3d16719aa102444337f161c457502704a4967a53 /drivers/ata/libata-sff.c
parentab08ed1770140ebcf1be1657087689832b755874 (diff)
parent3be6cbd73f74b4a3da82cc7d6e1688a4ae595fc7 (diff)
downloadkernel-crypto-2af170dd241810212cbdbdc802ba7d39e3fb23b9.tar.gz
kernel-crypto-2af170dd241810212cbdbdc802ba7d39e3fb23b9.tar.xz
kernel-crypto-2af170dd241810212cbdbdc802ba7d39e3fb23b9.zip
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [libata] kill ata_sg_is_last() Update libata driver for bf548 atapi controller against the 2.6.24 tree. libata-sff: Correct use of check_status() drivers/ata: add support to Freescale 3.0Gbps SATA Controller pata_acpi: fix build breakage if !CONFIG_PM
Diffstat (limited to 'drivers/ata/libata-sff.c')
-rw-r--r--drivers/ata/libata-sff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index c7501058d07..f9e4cd52794 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -156,7 +156,7 @@ void ata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
{
struct ata_ioports *ioaddr = &ap->ioaddr;
- tf->command = ata_check_status(ap);
+ tf->command = ata_chk_status(ap);
tf->feature = ioread8(ioaddr->error_addr);
tf->nsect = ioread8(ioaddr->nsect_addr);
tf->lbal = ioread8(ioaddr->lbal_addr);