Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750911AbWE1UeW (ORCPT ); Sun, 28 May 2006 16:34:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750916AbWE1UeW (ORCPT ); Sun, 28 May 2006 16:34:22 -0400 Received: from havoc.gtf.org ([69.61.125.42]:51586 "EHLO havoc.gtf.org") by vger.kernel.org with ESMTP id S1750907AbWE1UeV (ORCPT ); Sun, 28 May 2006 16:34:21 -0400 Date: Sun, 28 May 2006 16:34:19 -0400 From: Jeff Garzik To: Andrew Morton , Linus Torvalds Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [git patch] libata resume fix Message-ID: <20060528203419.GA15087@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 Content-Length: 970 Lines: 29 Please pull from 'upstream-fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git to receive the following updates: drivers/scsi/libata-core.c | 1 + 1 file changed, 1 insertion(+) Mark Lord: the latest consensus libata resume fix diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index fa476e7..b046ffa 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -4297,6 +4297,7 @@ static int ata_start_drive(struct ata_po int ata_device_resume(struct ata_port *ap, struct ata_device *dev) { if (ap->flags & ATA_FLAG_SUSPENDED) { + ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000); ap->flags &= ~ATA_FLAG_SUSPENDED; ata_set_mode(ap); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/