diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/dsi.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/dss/dsi.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 921e794aec0d..0afefac4bf65 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c | |||
@@ -4886,15 +4886,9 @@ static int dsi_connect(struct omap_dss_device *src, | |||
4886 | { | 4886 | { |
4887 | int r; | 4887 | int r; |
4888 | 4888 | ||
4889 | r = dss_mgr_connect(dst); | ||
4890 | if (r) | ||
4891 | return r; | ||
4892 | |||
4893 | r = omapdss_device_connect(dst->dss, dst, dst->next); | 4889 | r = omapdss_device_connect(dst->dss, dst, dst->next); |
4894 | if (r) { | 4890 | if (r) |
4895 | dss_mgr_disconnect(dst); | ||
4896 | return r; | 4891 | return r; |
4897 | } | ||
4898 | 4892 | ||
4899 | dst->dispc_channel_connected = true; | 4893 | dst->dispc_channel_connected = true; |
4900 | return 0; | 4894 | return 0; |
@@ -4906,8 +4900,6 @@ static void dsi_disconnect(struct omap_dss_device *src, | |||
4906 | dst->dispc_channel_connected = false; | 4900 | dst->dispc_channel_connected = false; |
4907 | 4901 | ||
4908 | omapdss_device_disconnect(dst, dst->next); | 4902 | omapdss_device_disconnect(dst, dst->next); |
4909 | |||
4910 | dss_mgr_disconnect(dst); | ||
4911 | } | 4903 | } |
4912 | 4904 | ||
4913 | static const struct omap_dss_device_ops dsi_ops = { | 4905 | static const struct omap_dss_device_ops dsi_ops = { |