From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 9 Feb 2006 06:56:05 +0000 (-0500)
Subject: [libata scsi] build fix for ATA_FLAG_IN_EH change
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5140788f77d71b4f05fde217adbfb0c92f28f20c;p=linux-beck.git

[libata scsi] build fix for ATA_FLAG_IN_EH change
---

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 3a4f40b251fb..b007bb409382 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/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));