diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-06-19 12:55:31 +0200 |
| commit | d81344c50824a4d28a9397e97135d60075ac37ff (patch) | |
| tree | d25c443fb4a764cd788db857c49dd3d3f8f722d3 /drivers/platform/x86/samsung-q10.c | |
| parent | 0de358f1c2642710d41190b73fbc295e675c4ab8 (diff) | |
| parent | 29bb9e5a75684106a37593ad75ec75ff8312731b (diff) | |
Merge branch 'sched/urgent' into sched/core
Merge in fixes before applying ongoing new work.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/platform/x86/samsung-q10.c')
| -rw-r--r-- | drivers/platform/x86/samsung-q10.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c index 5f770059fd4d..1a90b62a71c6 100644 --- a/drivers/platform/x86/samsung-q10.c +++ b/drivers/platform/x86/samsung-q10.c @@ -176,10 +176,7 @@ static int __init samsungq10_init(void) samsungq10_probe, NULL, 0, NULL, 0); - if (IS_ERR(samsungq10_device)) - return PTR_ERR(samsungq10_device); - - return 0; + return PTR_RET(samsungq10_device); } static void __exit samsungq10_exit(void) |