Commit 04a3d311 authored by Marc Zyngier's avatar Marc Zyngier Committed by Linus Torvalds

[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: default avatarMarc Zyngier <maz@misterjones.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 48970800
...@@ -2173,15 +2173,17 @@ static int probe_si (struct sx_board *board) ...@@ -2173,15 +2173,17 @@ static int probe_si (struct sx_board *board)
if ( IS_SI1_BOARD(board)) { if ( IS_SI1_BOARD(board)) {
/* This should be an SI1 board, which has this /* This should be an SI1 board, which has this
location writable... */ location writable... */
if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) {
func_exit (); func_exit ();
return 0; return 0;
}
} else { } else {
/* This should be an SI2 board, which has the bottom /* This should be an SI2 board, which has the bottom
3 bits non-writable... */ 3 bits non-writable... */
if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) {
func_exit (); func_exit ();
return 0; return 0;
}
} }
/* Now we're pretty much convinced that there is an SI board here, /* Now we're pretty much convinced that there is an SI board here,
...@@ -2192,15 +2194,17 @@ static int probe_si (struct sx_board *board) ...@@ -2192,15 +2194,17 @@ static int probe_si (struct sx_board *board)
if ( IS_SI1_BOARD(board)) { if ( IS_SI1_BOARD(board)) {
/* This should be an SI1 board, which has this /* This should be an SI1 board, which has this
location writable... */ location writable... */
if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) if (read_sx_byte (board, SI2_ISA_ID_BASE) != 0x10) {
func_exit(); func_exit();
return 0; return 0;
}
} else { } else {
/* This should be an SI2 board, which has the bottom /* This should be an SI2 board, which has the bottom
3 bits non-writable... */ 3 bits non-writable... */
if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) if (read_sx_byte (board, SI2_ISA_ID_BASE) == 0x10) {
func_exit (); func_exit ();
return 0; return 0;
}
} }
printheader (); printheader ();
......
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