Skip to content

Commit

Permalink
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] sata_via: fix obvious typo
  • Loading branch information
Linus Torvalds committed Nov 8, 2006
2 parents 3ee783a + 68ff6e8 commit 464908d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/ata/sata_via.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 464908d

Please sign in to comment.