---

yaml --- r: 350263 b: refs/heads/master c: 7d0315a h: refs/heads/master i: 350261: cdecc4f 350259: c5e0039 350255: afdd673 v: v3
git-mirror · Dec 28, 2012 · 32df3be · 32df3be
1 parent d29d03a
commit 32df3be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7998005bf7a706a1d6bb3cf2e9783b6437e4419d
+refs/heads/master: 7d0315a2bec2dd7fe9cbe31098bb89536648224e
diff --git a/trunk/drivers/video/exynos/exynos_dp_core.c b/trunk/drivers/video/exynos/exynos_dp_core.c
@@ -1121,8 +1121,7 @@ static int __devexit exynos_dp_remove(struct platform_device *pdev)
 
 	disable_irq(dp->irq);
 
-	if (work_pending(&dp->hotplug_work))
-		flush_work(&dp->hotplug_work);
+	flush_work(&dp->hotplug_work);
 
 	if (pdev->dev.of_node) {
 		if (dp->phy_addr)
@@ -1144,8 +1143,7 @@ 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);
 
-	if (work_pending(&dp->hotplug_work))
-		flush_work(&dp->hotplug_work);
+	flush_work(&dp->hotplug_work);
 
 	if (dev->of_node) {
 		if (dp->phy_addr)