diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-08 12:32:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-04-08 12:32:07 +0200 |
| commit | f69e44b2059f2238ac558b4a115ebcdefe20b9be (patch) | |
| tree | be2a95654d7c9cb38bbcbb7a83b862db359c79e1 /drivers/cpuidle/cpuidle-kirkwood.c | |
| parent | 0f0c8aa0d0562954cdfa135efb827067de7ba855 (diff) | |
| parent | b6269efb146eb8770d753e3dc1c561f1cffb631a (diff) | |
Merge branch 'pm-cpuidle-next' into linux-next
* pm-cpuidle-next:
cpuidle: imx6: remove timer broadcast initialization
cpuidle: OMAP4: remove timer broadcast initialization
cpuidle: ux500: remove timer broadcast initialization
cpuidle: initialize the broadcast timer framework
timer: move enum definition out of ifdef section
cpuidle: kirkwood: fix coccicheck warnings
cpuidle / kirkwood: remove redundant Kconfig option
cpuidle / ux500 : use CPUIDLE_FLAG_TIMER_STOP flag
cpuidle / imx6 : use CPUIDLE_FLAG_TIMER_STOP flag
cpuidle / omap4 : use CPUIDLE_FLAG_TIMER_STOP flag
cpuidle : handle clockevent notify from the cpuidle framework
Diffstat (limited to 'drivers/cpuidle/cpuidle-kirkwood.c')
| -rw-r--r-- | drivers/cpuidle/cpuidle-kirkwood.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/cpuidle/cpuidle-kirkwood.c b/drivers/cpuidle/cpuidle-kirkwood.c index 670aa1e55cd..53aad732496 100644 --- a/drivers/cpuidle/cpuidle-kirkwood.c +++ b/drivers/cpuidle/cpuidle-kirkwood.c @@ -66,9 +66,9 @@ static int kirkwood_cpuidle_probe(struct platform_device *pdev) if (res == NULL) return -EINVAL; - ddr_operation_base = devm_request_and_ioremap(&pdev->dev, res); - if (!ddr_operation_base) - return -EADDRNOTAVAIL; + ddr_operation_base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(ddr_operation_base)) + return PTR_ERR(ddr_operation_base); device = &per_cpu(kirkwood_cpuidle_device, smp_processor_id()); device->state_count = KIRKWOOD_MAX_STATES; |