diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2011-09-20 09:16:12 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:35:48 -0800 |
| commit | 50f621d8f5b6f9e8ed931df12c595fd0e882f8e3 (patch) | |
| tree | ceda6892f48dc5ce8054d9765ebdef0eacf338d4 /drivers/platform | |
| parent | 08a84a609d1679c9aeb958c3bc7886118e682b77 (diff) | |
| download | kernel_samsung_smdk4412-50f621d8f5b6f9e8ed931df12c595fd0e882f8e3.zip kernel_samsung_smdk4412-50f621d8f5b6f9e8ed931df12c595fd0e882f8e3.tar.gz kernel_samsung_smdk4412-50f621d8f5b6f9e8ed931df12c595fd0e882f8e3.tar.bz2 | |
Platform: Fix error path in samsung-laptop init
commit a7ea19926ffba86f373f6050a106cd162dbb9a78 upstream.
samsung_init() should not return success if not all devices are initialized.
Otherwise, samsung_exit() will dereference sdev NULL pointers and others.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/samsung-laptop.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c index 33d3c3f..ec85987 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c @@ -789,7 +789,7 @@ static int __init samsung_init(void) sabi_iface = ioremap_nocache(ifaceP, 16); if (!sabi_iface) { pr_err("Can't remap %x\n", ifaceP); - goto exit; + goto error_no_signature; } if (debug) { printk(KERN_DEBUG "ifaceP = 0x%08x\n", ifaceP); @@ -841,7 +841,6 @@ static int __init samsung_init(void) if (retval) goto error_file_create; -exit: return 0; error_file_create: |