diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-10 12:05:20 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-10 12:05:20 (GMT) |
commit | 5b4bdac94243b931a2c454dc7d925d23816a2426 (patch) | |
tree | 88c9ee36dcd4c7453917e84d0ba2fb99055571bd /drivers/acpi/acpi_pad.c | |
parent | 1ca8094403ae5553c6a0f404842be3075b302c70 (diff) | |
parent | db4f3dab629109882170a7b1b8fb655a34c52846 (diff) | |
download | linux-5b4bdac94243b931a2c454dc7d925d23816a2426.tar.xz |
Merge tag 'omap-pm-v3.10/cleanup/cpuidle-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-cpuidle
OMAP CPUidle cleanups for v3.10 from Kevin Hilman
Diffstat (limited to 'drivers/acpi/acpi_pad.c')
-rw-r--r-- | drivers/acpi/acpi_pad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index 31de104..27bb6a9 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c @@ -236,7 +236,7 @@ static int create_power_saving_task(void) ps_tsks[ps_tsk_num] = kthread_run(power_saving_thread, (void *)(unsigned long)ps_tsk_num, "acpi_pad/%d", ps_tsk_num); - rc = IS_ERR(ps_tsks[ps_tsk_num]) ? PTR_ERR(ps_tsks[ps_tsk_num]) : 0; + rc = PTR_RET(ps_tsks[ps_tsk_num]); if (!rc) ps_tsk_num++; else |