diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2011-08-26 11:55:46 +0100 |
|---|---|---|
| committer | Matthew Garrett <mjg@redhat.com> | 2011-10-24 16:52:39 +0200 |
| commit | 21893ab24c78ec844cbaffbb7bf11b33cfdea8b4 (patch) | |
| tree | 86aab2f5c007eb112331eb928ca9e802aee7bbf4 /drivers/platform | |
| parent | 6cb8c13da10855f17110421d9b13db015e11840e (diff) | |
| download | linux-21893ab24c78ec844cbaffbb7bf11b33cfdea8b4.tar.bz2 | |
intel_scu_ipcutil: fix major device number handling
We need to save major device number to be able to use it for
unregister_chrdev() in ipc_module_exit().
ipc_module_init() must return 0 on success, not major device number.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/intel_scu_ipcutil.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/platform/x86/intel_scu_ipcutil.c b/drivers/platform/x86/intel_scu_ipcutil.c index b93a03259c16..2d0f9136ea9a 100644 --- 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) |