From 720e0cd92a8bd0931951405c9a24b072e9339319 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 10 Oct 2007 15:57:44 +0900 Subject: [PATCH] --- yaml --- r: 69345 b: refs/heads/master c: f58db80267c24e15d959e372d23651a43443c5f3 h: refs/heads/master i: 69343: a31a32e4ac0dff8e93237b8a2d6ff07bab5cd1f4 v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-scsi.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3a536fe667b6..b6327e6f8510 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f140f0f12fc8dc7264d2f97cbe663564e7d24f6d +refs/heads/master: f58db80267c24e15d959e372d23651a43443c5f3 diff --git a/trunk/drivers/ata/libata-scsi.c b/trunk/drivers/ata/libata-scsi.c index ea53e6a570b4..d63c81ed084f 100644 --- a/trunk/drivers/ata/libata-scsi.c +++ b/trunk/drivers/ata/libata-scsi.c @@ -1363,6 +1363,7 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc) static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) { struct ata_port *ap = qc->ap; + struct ata_eh_info *ehi = &qc->dev->link->eh_info; struct scsi_cmnd *cmd = qc->scsicmd; u8 *cdb = cmd->cmnd; int need_sense = (qc->err_mask != 0); @@ -1376,14 +1377,14 @@ static void ata_scsi_qc_complete(struct ata_queued_cmd *qc) case ATA_CMD_SET_FEATURES: if ((qc->tf.feature == SETFEATURES_WC_ON) || (qc->tf.feature == SETFEATURES_WC_OFF)) { - ap->link.eh_info.action |= ATA_EH_REVALIDATE; + ehi->action |= ATA_EH_REVALIDATE; ata_port_schedule_eh(ap); } break; case ATA_CMD_INIT_DEV_PARAMS: /* CHS translation changed */ case ATA_CMD_SET_MULTI: /* multi_count changed */ - ap->link.eh_info.action |= ATA_EH_REVALIDATE; + ehi->action |= ATA_EH_REVALIDATE; ata_port_schedule_eh(ap); break; }