diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 20:37:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 20:37:43 +0200 |
| commit | 696314cf53b7b2d1f91af6da259533eb9611e7bf (patch) | |
| tree | 8e1bf5ea4c322f8b6985b1349d768d2837e417db /arch/arm/mach-omap2/smartreflex.c | |
| parent | 419bb4e0641cf7d84b1684b15afdd176f25c7ebe (diff) | |
| parent | e9d0b97eef235eccc3df9ddb9895b35c53a8aaa2 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex.c')
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 2ce2fb7664bc..34c01a7de810 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c @@ -621,7 +621,7 @@ void sr_disable(struct voltagedomain *voltdm) sr_v2_disable(sr); } - pm_runtime_put_sync(&sr->pdev->dev); + pm_runtime_put_sync_suspend(&sr->pdev->dev); } /** @@ -860,6 +860,7 @@ static int __init omap_sr_probe(struct platform_device *pdev) irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); pm_runtime_enable(&pdev->dev); + pm_runtime_irq_safe(&pdev->dev); sr_info->pdev = pdev; sr_info->srid = pdev->id; |