Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[cascardo/linux.git] / drivers / acpi / acpi_pad.c

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index 6230637..fc6008f 100644 (file)
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -231,16 +231,19 @@ static struct task_struct *ps_tsks[NR_CPUS];
 static unsigned int ps_tsk_num;
 static int create_power_saving_task(void)
 {
-       int rc = -ENOMEM;
+       int rc;
 
        ps_tsks[ps_tsk_num] = kthread_run(power_saving_thread,
                (void *)(unsigned long)ps_tsk_num,
                "acpi_pad/%d", ps_tsk_num);
-       rc = PTR_RET(ps_tsks[ps_tsk_num]);
-       if (!rc)
-               ps_tsk_num++;
-       else
+
+       if (IS_ERR(ps_tsks[ps_tsk_num])) {
+               rc = PTR_ERR(ps_tsks[ps_tsk_num]);
                ps_tsks[ps_tsk_num] = NULL;
+       } else {
+               rc = 0;
+               ps_tsk_num++;
+       }
 
        return rc;
 }