From 94c5d6ebe11a45c7d8738af476df38405a766384 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 9 Sep 2003 10:19:28 -0700 Subject: [PATCH] [PATCH] Fix imm.c again From: Adrian Bunk Earlier patch wasn't correct especially in the !CONFIG_SCSI_IZIP_EPP16 case, reading all uses of this array (IMM_MODE_STRING is used to print the corresponding string in printks). If I'm not misunderstanding it, CONFIG_SCSI_IZIP_EPP16 means "use 16bit even when 32bit is requested". It seems the right solution is static char *IMM_MODE_STRING[] = { [IMM_AUTODETECT] = "Autodetect", [IMM_NIBBLE] = "SPP", [IMM_PS2] = "PS/2", [IMM_EPP_8] = "EPP 8 bit", [IMM_EPP_16] = "EPP 16 bit", #ifdef CONFIG_SCSI_IZIP_EPP16 [IMM_EPP_32] = "EPP 16 bit", #else [IMM_EPP_32] = "EPP 32 bit", #endif [IMM_UNKNOWN] = "Unknown", }; --- drivers/scsi/imm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/imm.h b/drivers/scsi/imm.h index 4b5b28f965fd9..800d38fc80cce 100644 --- a/drivers/scsi/imm.h +++ b/drivers/scsi/imm.h @@ -100,8 +100,9 @@ static char *IMM_MODE_STRING[] = [IMM_NIBBLE] = "SPP", [IMM_PS2] = "PS/2", [IMM_EPP_8] = "EPP 8 bit", -#ifdef CONFIG_SCSI_IZIP_EPP16 [IMM_EPP_16] = "EPP 16 bit", +#ifdef CONFIG_SCSI_IZIP_EPP16 + [IMM_EPP_32] = "EPP 16 bit", #else [IMM_EPP_32] = "EPP 32 bit", #endif -- 2.53.0