aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-08 08:05:59 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-08 08:05:59 -0800
commit464908d7e2a9f77cb50ee905cda8a59e5b4e50e4 (patch)
treebfa297c761d9f0b7c593aaefe3bed14c87c11dcd
parent3ee783a3e4867ce5691bfa6a818959e88a50f209 (diff)
parent68ff6e8e0e203580ecb118319b5a3b53962edf5a (diff)
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] sata_via: fix obvious typo
-rw-r--r--drivers/ata/sata_via.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index f4455a1efe2..1c7f19aecc2 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -230,7 +230,7 @@ static int vt6420_prereset(struct ata_port *ap)
int online;
/* don't do any SCR stuff if we're not loading */
- if (!ATA_PFLAG_LOADING)
+ if (!(ap->pflags & ATA_PFLAG_LOADING))
goto skip_scr;
/* Resume phy. This is the old resume sequence from