From b76d249e0a38efb7562cd0476f688babe9711b35 Mon Sep 17 00:00:00 2001
From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 9 Feb 2006 01:56:05 -0500
Subject: [PATCH] --- yaml --- r: 21816 b: refs/heads/master c:
 5140788f77d71b4f05fde217adbfb0c92f28f20c h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/scsi/libata-scsi.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cd24632b051d..d04588ab338d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a7921e8661a6b9fb99400983ee67df7e125853b
+refs/heads/master: 5140788f77d71b4f05fde217adbfb0c92f28f20c
diff --git a/trunk/drivers/scsi/libata-scsi.c b/trunk/drivers/scsi/libata-scsi.c
index 3a4f40b251fb..b007bb409382 100644
--- a/trunk/drivers/scsi/libata-scsi.c
+++ b/trunk/drivers/scsi/libata-scsi.c
@@ -732,15 +732,17 @@ int ata_scsi_slave_config(struct scsi_device *sdev)
 int ata_scsi_error(struct Scsi_Host *host)
 {
 	struct ata_port *ap;
+	unsigned long flags;
 
 	DPRINTK("ENTER\n");
 
+	ap = (struct ata_port *) &host->hostdata[0];
+
 	spin_lock_irqsave(&ap->host_set->lock, flags);
 	assert(!(ap->flags & ATA_FLAG_IN_EH));
 	ap->flags |= ATA_FLAG_IN_EH;
 	spin_unlock_irqrestore(&ap->host_set->lock, flags);
 
-	ap = (struct ata_port *) &host->hostdata[0];
 	ap->ops->eng_timeout(ap);
 
 	assert(host->host_failed == 0 && list_empty(&host->eh_cmd_q));