aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/dss/venc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/venc.c')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/venc.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c
index 00421e2a8eb6..100a02a9447f 100644
--- a/drivers/gpu/drm/omapdrm/dss/venc.c
+++ b/drivers/gpu/drm/omapdrm/dss/venc.c
@@ -696,15 +696,9 @@ static int venc_connect(struct omap_dss_device *src,
696{ 696{
697 int r; 697 int r;
698 698
699 r = dss_mgr_connect(dst);
700 if (r)
701 return r;
702
703 r = omapdss_device_connect(dst->dss, dst, dst->next); 699 r = omapdss_device_connect(dst->dss, dst, dst->next);
704 if (r) { 700 if (r)
705 dss_mgr_disconnect(dst);
706 return r; 701 return r;
707 }
708 702
709 dst->dispc_channel_connected = true; 703 dst->dispc_channel_connected = true;
710 return 0; 704 return 0;
@@ -716,8 +710,6 @@ static void venc_disconnect(struct omap_dss_device *src,
716 dst->dispc_channel_connected = false; 710 dst->dispc_channel_connected = false;
717 711
718 omapdss_device_disconnect(dst, dst->next); 712 omapdss_device_disconnect(dst, dst->next);
719
720 dss_mgr_disconnect(dst);
721} 713}
722 714
723static const struct omap_dss_device_ops venc_ops = { 715static const struct omap_dss_device_ops venc_ops = {