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

+1 -1
+1 -1
drivers/ata/sata_via.c
··· 230 int online; 231 232 /* don't do any SCR stuff if we're not loading */ 233 - if (!ATA_PFLAG_LOADING) 234 goto skip_scr; 235 236 /* Resume phy. This is the old resume sequence from
··· 230 int online; 231 232 /* don't do any SCR stuff if we're not loading */ 233 + if (!(ap->pflags & ATA_PFLAG_LOADING)) 234 goto skip_scr; 235 236 /* Resume phy. This is the old resume sequence from