aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAjay Kumar <ajaykumar.rs@samsung.com>2013-02-21 19:42:38 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:22:18 -0500
commit9ea8b9a5456e73a1793af1b96683db8a1f103fde (patch)
tree92e066d231b77b561cfd5907b0f26f5669ee8a57
parentd3ed97035b2ed8be0c67768ca7e050547d860ca5 (diff)
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)
1126 struct exynos_dp_platdata *pdata = pdev->dev.platform_data; 1126 struct exynos_dp_platdata *pdata = pdev->dev.platform_data;
1127 struct exynos_dp_device *dp = platform_get_drvdata(pdev); 1127 struct exynos_dp_device *dp = platform_get_drvdata(pdev);
1128 1128
1129 disable_irq(dp->irq);
1130
1131 flush_work(&dp->hotplug_work); 1129 flush_work(&dp->hotplug_work);
1132 1130
1133 if (pdev->dev.of_node) { 1131 if (pdev->dev.of_node) {
@@ -1150,6 +1148,8 @@ static int exynos_dp_suspend(struct device *dev)
1150 struct exynos_dp_platdata *pdata = dev->platform_data; 1148 struct exynos_dp_platdata *pdata = dev->platform_data;
1151 struct exynos_dp_device *dp = dev_get_drvdata(dev); 1149 struct exynos_dp_device *dp = dev_get_drvdata(dev);
1152 1150
1151 disable_irq(dp->irq);
1152
1153 flush_work(&dp->hotplug_work); 1153 flush_work(&dp->hotplug_work);
1154 1154
1155 if (dev->of_node) { 1155 if (dev->of_node) {