Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[pandora-kernel.git] / drivers / platform / x86 / intel_scu_ipcutil.c

diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel_scu_ipcutil.c
index b93a032..2d0f913 100644 (file)
--- a/drivers/platform/x86/intel_scu_ipcutil.c
+++ b/drivers/platform/x86/intel_scu_ipcutil.c
@@ -24,7 +24,7 @@
 #include <linux/init.h>
 #include <asm/intel_scu_ipc.h>
 
-static u32 major;
+static int major;
 
 #define MAX_FW_SIZE 264192
 
@@ -117,7 +117,11 @@ static const struct file_operations scu_ipc_fops = {
 
 static int __init ipc_module_init(void)
 {
-       return register_chrdev(0, "intel_mid_scu", &scu_ipc_fops);
+       major = register_chrdev(0, "intel_mid_scu", &scu_ipc_fops);
+       if (major < 0)
+               return major;
+
+       return 0;
 }
 
 static void __exit ipc_module_exit(void)