---

yaml
---
r: 181257
b: refs/heads/master
c: e7efe59
h: refs/heads/master
i:
  181255: b46e298
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d7ebb9c7a04d29efce1099024944dfd94d9f63c
+refs/heads/master: e7efe5932b1d3916c79326a4221693ea90a900e2

trunk/drivers/scsi/scsi_lib.c

@@ -773,8 +773,14 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
 	 * we already took a copy of the original into rq->errors which
 	 * is what gets returned to the user
 	 */
-	if (sense_valid && sshdr.sense_key == RECOVERED_ERROR) {
-		if (!(req->cmd_flags & REQ_QUIET))
+	if (sense_valid && (sshdr.sense_key == RECOVERED_ERROR)) {
+		/* if ATA PASS-THROUGH INFORMATION AVAILABLE skip
+		 * print since caller wants ATA registers. Only occurs on
+		 * SCSI ATA PASS_THROUGH commands when CK_COND=1
+		 */
+		if ((sshdr.asc == 0x0) && (sshdr.ascq == 0x1d))
+			;
+		else if (!(req->cmd_flags & REQ_QUIET))
 			scsi_print_sense("", cmd);
 		result = 0;
 		/* BLOCK_PC may have set error */