git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[sfrench/cifs-2.6.git]
/
drivers
/
ata
/
libata-sff.c
diff --git
a/drivers/ata/libata-sff.c
b/drivers/ata/libata-sff.c
index c7501058d07ded67c156e24412b399f58ce52626..f9e4cd5279423c678343aca53d2078937df6fe7f 100644
(file)
--- 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_ch
ec
k_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);