aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/dss/sdi.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c
index 12eb4042dd82..3de3c1e559aa 100644
--- a/drivers/video/omap2/dss/sdi.c
+++ b/drivers/video/omap2/dss/sdi.c
@@ -115,17 +115,9 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev)
115 115
116 dssdev->manager->enable(dssdev->manager); 116 dssdev->manager->enable(dssdev->manager);
117 117
118 if (dssdev->driver->enable) {
119 r = dssdev->driver->enable(dssdev);
120 if (r)
121 goto err3;
122 }
123
124 sdi.skip_init = 0; 118 sdi.skip_init = 0;
125 119
126 return 0; 120 return 0;
127err3:
128 dssdev->manager->disable(dssdev->manager);
129err2: 121err2:
130 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1); 122 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK1);
131err1: 123err1:
@@ -137,9 +129,6 @@ EXPORT_SYMBOL(omapdss_sdi_display_enable);
137 129
138void omapdss_sdi_display_disable(struct omap_dss_device *dssdev) 130void omapdss_sdi_display_disable(struct omap_dss_device *dssdev)
139{ 131{
140 if (dssdev->driver->disable)
141 dssdev->driver->disable(dssdev);
142
143 dssdev->manager->disable(dssdev->manager); 132 dssdev->manager->disable(dssdev->manager);
144 133
145 dss_sdi_disable(); 134 dss_sdi_disable();