From 32df3be32789df4a1542029610997b624bc6cc85 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 21 Dec 2012 17:57:13 -0800 Subject: [PATCH] --- yaml --- r: 350263 b: refs/heads/master c: 7d0315a2bec2dd7fe9cbe31098bb89536648224e h: refs/heads/master i: 350261: cdecc4f2cb90f13ac8db84ebfb4e02cc2ae52f11 350259: c5e0039e09636a0b7c30ed5b24b78a851b4f77ee 350255: afdd673ba492edddf71bbbfe31aea091e3cdea8d v: v3 --- [refs] | 2 +- trunk/drivers/video/exynos/exynos_dp_core.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 227995e7dd47..d4738ee3a4ee 100644 --- 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 index 28fd686c6b81..3002a6acce12 100644 --- 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)