git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ia64
/
sn
/
kernel
/
tiocx.c
diff --git
a/arch/ia64/sn/kernel/tiocx.c
b/arch/ia64/sn/kernel/tiocx.c
index
99cb28e
..
493380b
100644
(file)
--- a/
arch/ia64/sn/kernel/tiocx.c
+++ b/
arch/ia64/sn/kernel/tiocx.c
@@
-369,9
+369,15
@@
static void tio_corelet_reset(nasid_t nasid, int corelet)
static int is_fpga_tio(int nasid, int *bt)
{
static int is_fpga_tio(int nasid, int *bt)
{
- int ioboard_type;
+ u16 ioboard_type;
+ s64 rc;
- ioboard_type = ia64_sn_sysctl_ioboard_get(nasid);
+ rc = ia64_sn_sysctl_ioboard_get(nasid, &ioboard_type);
+ if (rc) {
+ printk(KERN_WARNING "ia64_sn_sysctl_ioboard_get failed: %ld\n",
+ rc);
+ return 0;
+ }
switch (ioboard_type) {
case L1_BRICKTYPE_SA:
switch (ioboard_type) {
case L1_BRICKTYPE_SA:
@@
-546,7
+552,7
@@
static void __exit tiocx_exit(void)
bus_unregister(&tiocx_bus_type);
}
bus_unregister(&tiocx_bus_type);
}
-
subsy
s_initcall(tiocx_init);
+
f
s_initcall(tiocx_init);
module_exit(tiocx_exit);
/************************************************************************
module_exit(tiocx_exit);
/************************************************************************