From 7cbe9dd545431723778670a3cc6c5489f6438a23 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 12 Jul 2012 17:29:55 +0900 Subject: [PATCH] --- yaml --- r: 311940 b: refs/heads/master c: ebc35c726298ba3fdebba316a592735268a520bc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/pm_domains.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6f854b632090..25eac74c7302 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76eb5567afd18aa0a61fd31cd80fb80b616aaba4 +refs/heads/master: ebc35c726298ba3fdebba316a592735268a520bc diff --git a/trunk/arch/arm/mach-exynos/pm_domains.c b/trunk/arch/arm/mach-exynos/pm_domains.c index 0a952a5c45bd..373c3c00d24c 100644 --- a/trunk/arch/arm/mach-exynos/pm_domains.c +++ b/trunk/arch/arm/mach-exynos/pm_domains.c @@ -119,7 +119,9 @@ static __init void exynos_pm_add_dev_to_genpd(struct platform_device *pdev, struct exynos_pm_domain *pd) { if (pdev->dev.bus) { - if (pm_genpd_add_device(&pd->pd, &pdev->dev)) + if (!pm_genpd_add_device(&pd->pd, &pdev->dev)) + pm_genpd_dev_need_restore(&pdev->dev, true); + else pr_info("%s: error in adding %s device to %s power" "domain\n", __func__, dev_name(&pdev->dev), pd->name);