Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev (464908d7) · Commits · 戴 / test

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