Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / ia64 / sn / kernel / tiocx.c

diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 99cb28e74295476bc7e074034491f84fcbb77067..493380b2c05fd1b6756ad9edb711c4992125f5e7 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)
 {
-       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:
@@ -546,7 +552,7 @@ static void __exit tiocx_exit(void)
        bus_unregister(&tiocx_bus_type);
 }
 
-subsys_initcall(tiocx_init);
+fs_initcall(tiocx_init);
 module_exit(tiocx_exit);
 
 /************************************************************************