summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-scsi.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 07:56:05 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 07:56:05 +0100
commit5140788f77d71b4f05fde217adbfb0c92f28f20c (patch)
tree2f1dde965303d621269bf276f26185a2b4ae9ac9 /drivers/scsi/libata-scsi.c
parent[PATCH] libata: separate out sata_phy_resume() from sata_std_hardreset() (diff)
downloadlinux-5140788f77d71b4f05fde217adbfb0c92f28f20c.tar.xz
linux-5140788f77d71b4f05fde217adbfb0c92f28f20c.zip
[libata scsi] build fix for ATA_FLAG_IN_EH change
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
-rw-r--r--drivers/scsi/libata-scsi.c4
1 files changed, 3 insertions, 1 deletions
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));