From cf0c43acb16f2c1ea731b902aa1b762b2bd9a42d Mon Sep 17 00:00:00 2001
From: Albert Lee <albertcc@tw.ibm.com>
Date: Fri, 31 Mar 2006 13:29:04 +0800
Subject: [PATCH] --- yaml --- r: 29411 b: refs/heads/master c:
 08a556db919f67e1e4d33ae8d40f7222da34d994 h: refs/heads/master i:   29409:
 c23c03ae9710c2d8ebcd35575d502471a8a6d108   29407:
 e198076542a22ce7773184e3618440b29bf64d83 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/scsi/libata-core.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e80861a8da35..c45cc6375db9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f0e7c51ae392d841be395a9c6b8d26a9fbf33d2
+refs/heads/master: 08a556db919f67e1e4d33ae8d40f7222da34d994
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
index a14187e32d0a..f18742e8d72d 100644
--- a/trunk/drivers/scsi/libata-core.c
+++ b/trunk/drivers/scsi/libata-core.c
@@ -1305,6 +1305,8 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
 
 	/* ATAPI-specific feature tests */
 	else if (dev->class == ATA_DEV_ATAPI) {
+		char *cdb_intr_string = "";
+
 		rc = atapi_cdb_len(id);
 		if ((rc < 12) || (rc > ATAPI_CDB_LEN)) {
 			printk(KERN_WARNING "ata%u: unsupported CDB len\n", ap->id);
@@ -1313,13 +1315,16 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
 		}
 		dev->cdb_len = (unsigned int) rc;
 
-		if (ata_id_cdb_intr(dev->id))
+		if (ata_id_cdb_intr(dev->id)) {
 			dev->flags |= ATA_DFLAG_CDB_INTR;
+			cdb_intr_string = ", CDB intr";
+		}
 
 		/* print device info to dmesg */
 		if (print_info)
-			printk(KERN_INFO "ata%u: dev %u ATAPI, max %s\n",
-			       ap->id, dev->devno, ata_mode_string(xfer_mask));
+			printk(KERN_INFO "ata%u: dev %u ATAPI, max %s%s\n",
+			       ap->id, dev->devno, ata_mode_string(xfer_mask),
+			       cdb_intr_string);
 	}
 
 	ap->host->max_cmd_len = 0;