Commit 464908d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3ee783a3 68ff6e8e

drivers/ata/sata_via.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -230,7 +230,7 @@ static int vt6420_prereset(struct ata_port *ap) 
	int online;

	int online;





	/* don't do any SCR stuff if we're not loading */

	/* don't do any SCR stuff if we're not loading */

	if (!ATA_PFLAG_LOADING)

	if (!(ap->pflags & ATA_PFLAG_LOADING))

		goto skip_scr;

		goto skip_scr;





	/* Resume phy.  This is the old resume sequence from

	/* Resume phy.  This is the old resume sequence from