diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-08 11:05:59 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-08 11:05:59 -0500 |
| commit | 464908d7e2a9f77cb50ee905cda8a59e5b4e50e4 (patch) | |
| tree | bfa297c761d9f0b7c593aaefe3bed14c87c11dcd | |
| parent | 3ee783a3e4867ce5691bfa6a818959e88a50f209 (diff) | |
| parent | 68ff6e8e0e203580ecb118319b5a3b53962edf5a (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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index f4455a1efe2d..1c7f19aecc25 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) | |||
| 230 | int online; | 230 | int online; |
| 231 | 231 | ||
| 232 | /* don't do any SCR stuff if we're not loading */ | 232 | /* don't do any SCR stuff if we're not loading */ |
| 233 | if (!ATA_PFLAG_LOADING) | 233 | if (!(ap->pflags & ATA_PFLAG_LOADING)) |
| 234 | goto skip_scr; | 234 | goto skip_scr; |
| 235 | 235 | ||
| 236 | /* Resume phy. This is the old resume sequence from | 236 | /* Resume phy. This is the old resume sequence from |