Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-beck.git] / drivers / video / exynos / exynos_dp_core.c

diff --git a/drivers/video/exynos/exynos_dp_core.c b/drivers/video/exynos/exynos_dp_core.c
index 7aae0bf3b3728255edfb88525857f93dc0c71e45..2ed97769aa6d8ae7d2b93149e3339760490d5000 100644 (file)
--- a/drivers/video/exynos/exynos_dp_core.c
+++ b/drivers/video/exynos/exynos_dp_core.c
@@ -1119,8 +1119,7 @@ static int 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)
@@ -1142,8 +1141,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)