From 067e40fd61784e0cb66cedcc2efdb119e0b2d0e4 Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@ORACLE.COM>
Date: Wed, 20 Jan 2010 02:17:40 -0500
Subject: [PATCH] --- yaml --- r: 181396 b: refs/heads/master c:
 8475f688d796b875bf98ed161acd53d00a1483ff h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/scsi/constants.c | 17 +++++++----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 328e690d3c66..6f538a4fd427 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78d85019ba8c13e1094cad0ea9bb4f61caad8320
+refs/heads/master: 8475f688d796b875bf98ed161acd53d00a1483ff
diff --git a/trunk/drivers/scsi/constants.c b/trunk/drivers/scsi/constants.c
index 9129bcf117cf..7092ff67ecd3 100644
--- a/trunk/drivers/scsi/constants.c
+++ b/trunk/drivers/scsi/constants.c
@@ -219,18 +219,15 @@ static void print_opcode_name(unsigned char * cdbp, int cdb_len)
 			break;
 		}
 		sa = (cdbp[8] << 8) + cdbp[9];
-		name = get_sa_name(maint_in_arr, MAINT_IN_SZ, sa);
-		if (name) {
+		name = get_sa_name(variable_length_arr, VARIABLE_LENGTH_SZ, sa);
+		if (name)
 			printk("%s", name);
-			if ((cdb_len > 0) && (len != cdb_len))
-				printk(", in_cdb_len=%d, ext_len=%d",
-				       len, cdb_len);
-		} else {
+		else
 			printk("cdb[0]=0x%x, sa=0x%x", cdb0, sa);
-			if ((cdb_len > 0) && (len != cdb_len))
-				printk(", in_cdb_len=%d, ext_len=%d",
-				       len, cdb_len);
-		}
+
+		if ((cdb_len > 0) && (len != cdb_len))
+			printk(", in_cdb_len=%d, ext_len=%d", len, cdb_len);
+
 		break;
 	case MAINTENANCE_IN:
 		sa = cdbp[1] & 0x1f;