From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965673AbWKHMsg (ORCPT ); Wed, 8 Nov 2006 07:48:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S965668AbWKHMsf (ORCPT ); Wed, 8 Nov 2006 07:48:35 -0500 Received: from havoc.gtf.org ([69.61.125.42]:5565 "EHLO havoc.gtf.org") by vger.kernel.org with ESMTP id S965593AbWKHMse (ORCPT ); Wed, 8 Nov 2006 07:48:34 -0500 Date: Wed, 8 Nov 2006 07:48:27 -0500 From: Jeff Garzik To: Andrew Morton , Linus Torvalds Cc: linux-ide@vger.kernel.org, LKML Subject: [git patches] libata via probe fix Message-ID: <20061108124827.GA7348@havoc.gtf.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus to receive the following updates: drivers/ata/sata_via.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Jeff Garzik: [libata] sata_via: fix obvious typo diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c index f4455a1..1c7f19a 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c @@ -230,7 +230,7 @@ static int vt6420_prereset(struct ata_po 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