From 1e328fb696391c202a52afb6cbbcc6f013be9175 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Tue, 21 Nov 2006 10:40:51 +0900
Subject: [PATCH] --- yaml --- r: 42143 b: refs/heads/master c:
 a569a30d301e4dbc0ad67a211292edece2da1146 h: refs/heads/master i:   42141:
 c311668394713bf20f37a74c48380611702867b0   42139:
 6012f7ab0fc0b40f7cfbb8c36534b958ceeb1f7d   42135:
 49ba86c77ebcefabc8885f8ca2d5c9d3a0bd7b12   42127:
 0b5585e7eac4ac6c72df93a1bcbdd05e5a2e66ae   42111:
 7dad468ad7dd19027c671e6660c2a14f5c73c6ce v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/ata/libata-eh.c | 28 +++++++++++++++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 95563fd7df5d..2a937044d46f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a36261e63770ab61422550b774fe949ccca5fa9
+refs/heads/master: a569a30d301e4dbc0ad67a211292edece2da1146
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index 5aa7f0907e83..2aad7b79d6dd 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/drivers/ata/libata-eh.c
@@ -1136,19 +1136,21 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
 		break;
 
 	case ATA_DEV_ATAPI:
-		tmp = atapi_eh_request_sense(qc->dev,
-					     qc->scsicmd->sense_buffer);
-		if (!tmp) {
-			/* ATA_QCFLAG_SENSE_VALID is used to tell
-			 * atapi_qc_complete() that sense data is
-			 * already valid.
-			 *
-			 * TODO: interpret sense data and set
-			 * appropriate err_mask.
-			 */
-			qc->flags |= ATA_QCFLAG_SENSE_VALID;
-		} else
-			qc->err_mask |= tmp;
+		if (!(qc->ap->pflags & ATA_PFLAG_FROZEN)) {
+			tmp = atapi_eh_request_sense(qc->dev,
+						     qc->scsicmd->sense_buffer);
+			if (!tmp) {
+				/* ATA_QCFLAG_SENSE_VALID is used to
+				 * tell atapi_qc_complete() that sense
+				 * data is already valid.
+				 *
+				 * TODO: interpret sense data and set
+				 * appropriate err_mask.
+				 */
+				qc->flags |= ATA_QCFLAG_SENSE_VALID;
+			} else
+				qc->err_mask |= tmp;
+		}
 	}
 
 	if (qc->err_mask & (AC_ERR_HSM | AC_ERR_TIMEOUT | AC_ERR_ATA_BUS))