aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/dss/venc.c
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2015-11-05 09:44:53 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2016-03-03 17:38:23 +0200
commita0e53bfe9f41689d337955814bdc2e5c0f373009 (patch)
tree24415d9aa62c5502544dd2eb3e79382c2fc8fd30 /drivers/gpu/drm/omapdrm/dss/venc.c
parentdrm/omap: remove extra check in dpi and sdi (diff)
downloadlinux-dev-a0e53bfe9f41689d337955814bdc2e5c0f373009.tar.xz
linux-dev-a0e53bfe9f41689d337955814bdc2e5c0f373009.zip
drm/omap: remove extra manager checks on disconnect
The DSS output drivers check 'dssdev->manager' in disconnect() functions. This check is not needed as the manager must always be set if the output device was connected. Remove the check. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/venc.c')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/venc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 401c477242b1..d514c9878ae2 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -778,8 +778,7 @@ static void venc_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev);
- if (dssdev->manager)
- dss_mgr_disconnect(dssdev->manager->id, dssdev);
+ dss_mgr_disconnect(dssdev->manager->id, dssdev);
}
static const struct omapdss_atv_ops venc_ops = {