Commit dba5578d authored by Andrew Morton's avatar Andrew Morton Committed by Anton Blanchard

[PATCH] Fix imm.c again

From: Adrian Bunk <bunk@fs.tum.de>

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".

 drivers/scsi/imm.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)
parent e35b6d40
...@@ -100,8 +100,9 @@ static char *IMM_MODE_STRING[] = ...@@ -100,8 +100,9 @@ static char *IMM_MODE_STRING[] =
[IMM_NIBBLE] = "SPP", [IMM_NIBBLE] = "SPP",
[IMM_PS2] = "PS/2", [IMM_PS2] = "PS/2",
[IMM_EPP_8] = "EPP 8 bit", [IMM_EPP_8] = "EPP 8 bit",
#ifdef CONFIG_SCSI_IZIP_EPP16
[IMM_EPP_16] = "EPP 16 bit", [IMM_EPP_16] = "EPP 16 bit",
#ifdef CONFIG_SCSI_IZIP_EPP16
[IMM_EPP_32] = "EPP 16 bit",
#else #else
[IMM_EPP_32] = "EPP 32 bit", [IMM_EPP_32] = "EPP 32 bit",
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment