git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
misc
/
sgi-xp
/
xp_main.c
diff --git
a/drivers/misc/sgi-xp/xp_main.c
b/drivers/misc/sgi-xp/xp_main.c
index
16f8dca
..
7896849
100644
(file)
--- a/
drivers/misc/sgi-xp/xp_main.c
+++ b/
drivers/misc/sgi-xp/xp_main.c
@@
-248,19
+248,19
@@
xp_init(void)
enum xp_retval ret;
int ch_number;
enum xp_retval ret;
int ch_number;
+ /* initialize the connection registration mutex */
+ for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)
+ mutex_init(&xpc_registrations[ch_number].mutex);
+
if (is_shub())
ret = xp_init_sn2();
else if (is_uv())
ret = xp_init_uv();
else
if (is_shub())
ret = xp_init_sn2();
else if (is_uv())
ret = xp_init_uv();
else
- ret =
xpUnsupported
;
+ ret =
0
;
if (ret != xpSuccess)
if (ret != xpSuccess)
- return -ENODEV;
-
- /* initialize the connection registration mutex */
- for (ch_number = 0; ch_number < XPC_MAX_NCHANNELS; ch_number++)
- mutex_init(&xpc_registrations[ch_number].mutex);
+ return ret;
return 0;
}
return 0;
}