Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
[PATCH] Fix Specialix SI probing
As the (probably) last user of a Specialix SI board, I noticed that
recent kernels would fail to probe the sucker. Quick investigation
indicate a few missing braces...
I left the double probing in place, as it looks like it's been here
forever.
Signed-off-by: Marc Zyngier <maz@misterjones.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
authored by
Marc Zyngier
and committed by
Linus Torvalds
04a3d311
48970800
+8
-4
+8
-4
drivers/char/sx.c
+8
-4
drivers/char/sx.c
···
2173
2173
if ( IS_SI1_BOARD(board)) {
2174
2174
/* This should be an SI1 board, which has this
2175
2175
location writable... */
2176
-
if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10)
2176
+
if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) {
2177
2177
func_exit ();
2178
2178
return 0;
2179
+
}
2179
2180
} else {
2180
2181
/* This should be an SI2 board, which has the bottom
2181
2182
3 bits non-writable... */
2182
-
if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10)
2183
+
if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) {
2183
2184
func_exit ();
2184
2185
return 0;
2186
+
}
2185
2187
}
2186
2188
2187
2189
/* Now we're pretty much convinced that there is an SI board here,
···
2194
2192
if ( IS_SI1_BOARD(board)) {
2195
2193
/* This should be an SI1 board, which has this
2196
2194
location writable... */
2197
-
if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10)
2195
+
if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) {
2198
2196
func_exit();
2199
2197
return 0;
2198
+
}
2200
2199
} else {
2201
2200
/* This should be an SI2 board, which has the bottom
2202
2201
3 bits non-writable... */
2203
-
if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10)
2202
+
if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) {
2204
2203
func_exit ();
2205
2204
return 0;
2205
+
}
2206
2206
}
2207
2207
2208
2208
printheader ();