drm/bridge: tfp410: fix use of cancel_delayed_work_sync

[ Upstream commit b1622cb3be4557fd086831ca7426eafe5f1acc2e ]

We use delayed_work in HPD handling, and cancel any scheduled work in
tfp410_fini using cancel_delayed_work_sync(). However, we have only
initialized the delayed work if we actually have a HPD interrupt
configured in the DT, but in the tfp410_fini, we always cancel the work,
possibly causing a WARN().

Fix this by doing the cancel only if we actually had the delayed work
set up.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Andrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190610135739.6077-2-tomi.valkeinen@ti.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c
index a879aac212462c6dc5e8f935591a91a82464cc5c..3a8af9978ebdf9d5218bb53c1b2caec47d7c44e6 100644 (file)
--- a/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@ -372,7 +372,8 @@ static int tfp410_fini(struct device *dev)
 {
        struct tfp410 *dvi = dev_get_drvdata(dev);
 
-       cancel_delayed_work_sync(&dvi->hpd_work);
+       if (dvi->hpd_irq >= 0)
+               cancel_delayed_work_sync(&dvi->hpd_work);
 
        drm_bridge_remove(&dvi->bridge);