From 6a806b4624bfb2547fa9f0db48f29363dc5bc81c Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 19 Jun 2006 18:01:27 -0700 Subject: [PATCH] --- yaml --- r: 27223 b: refs/heads/master c: 1cca0ebbb74298958dae1d1d3e7e9287c98a720c h: refs/heads/master i: 27221: 56724a841ae95da7146604407ec266a3a9776e81 27219: 56793e43ab56cdf9d536b492d2ba5d52cc72a1d6 27215: cf19f0122df269bbb4a67094fec53079c120285e v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ddbe9737c11d..bd014973f38f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 427abfa28afedffadfca9dd8b067eb6d36bac53f +refs/heads/master: 1cca0ebbb74298958dae1d1d3e7e9287c98a720c diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index b046ffa22101..de9ba7890b5a 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -4297,6 +4297,7 @@ static int ata_start_drive(struct ata_port *ap, struct ata_device *dev) int ata_device_resume(struct ata_port *ap, struct ata_device *dev) { if (ap->flags & ATA_FLAG_SUSPENDED) { + ata_busy_sleep(ap, ATA_TMOUT_BOOT_QUICK, ATA_TMOUT_BOOT); ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000); ap->flags &= ~ATA_FLAG_SUSPENDED; ata_set_mode(ap);