Merge branch 'akpm' (second patch-bomb from Andrew)

[cascardo/linux.git] / drivers / scsi / constants.c

diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 0cf43f6..e2068a2 100644 (file)
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -21,11 +21,6 @@
 
 
 /* Commands with service actions that change the command name */
-#define SERVICE_ACTION_IN_12 0xab
-#define SERVICE_ACTION_OUT_12 0xa9
-#define SERVICE_ACTION_BIDIRECTIONAL 0x9d
-#define SERVICE_ACTION_IN_16 0x9e
-#define SERVICE_ACTION_OUT_16 0x9f
 #define THIRD_PARTY_COPY_OUT 0x83
 #define THIRD_PARTY_COPY_IN 0x84
 
@@ -1276,6 +1271,7 @@ scsi_extd_sense_format(unsigned char asc, unsigned char ascq, const char **fmt)
        int i;
        unsigned short code = ((asc << 8) | ascq);
 
+       *fmt = NULL;
        for (i = 0; additional[i].text; i++)
                if (additional[i].code12 == code)
                        return additional[i].text;
@@ -1287,6 +1283,8 @@ scsi_extd_sense_format(unsigned char asc, unsigned char ascq, const char **fmt)
                        return additional2[i].str;
                }
        }
+#else
+       *fmt = NULL;
 #endif
        return NULL;
 }