summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Kumar2013-02-22 01:42:38 +0100
committerLinus Torvalds2013-02-22 02:22:18 +0100
commit9ea8b9a5456e73a1793af1b96683db8a1f103fde (patch)
tree92e066d231b77b561cfd5907b0f26f5669ee8a57
parentvideo: exynos_dp: add missing of_node_put() (diff)
downloadkernel-qcow2-linux-9ea8b9a5456e73a1793af1b96683db8a1f103fde.tar.gz
kernel-qcow2-linux-9ea8b9a5456e73a1793af1b96683db8a1f103fde.tar.xz
kernel-qcow2-linux-9ea8b9a5456e73a1793af1b96683db8a1f103fde.zip
video: exynos_dp: move disable_irq() to exynos_dp_suspend()
disable_irq() should be moved to exynos_dp_suspend(), because enable_irq() is called at exynos_dp_resume(). Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com> Signed-off-by: Jingoo Han <jg1.han@samsung.com> Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/exynos/exynos_dp_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 68385a05cee6..4722234058ab 100644
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -1126,8 +1126,6 @@ static int exynos_dp_remove(struct platform_device *pdev)
struct exynos_dp_platdata *pdata = pdev->dev.platform_data;
struct exynos_dp_device *dp = platform_get_drvdata(pdev);
- disable_irq(dp->irq);
-
flush_work(&dp->hotplug_work);
if (pdev->dev.of_node) {
@@ -1150,6 +1148,8 @@ static int exynos_dp_suspend(struct device *dev)
struct exynos_dp_platdata *pdata = dev->platform_data;
struct exynos_dp_device *dp = dev_get_drvdata(dev);
+ disable_irq(dp->irq);
+
flush_work(&dp->hotplug_work);
if (dev->of_node) {