Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35bc42c5 authored by Jani Nikula's avatar Jani Nikula Committed by Tomi Valkeinen
Browse files

OMAP: DSS2: VENC: don't call platform_enable/disable() twice 



platform_enable/disable() is already called in venc_power_on/off(), so
don't do it again in venc_panel_enable/disable().

Signed-off-by: default avatarJani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@nokia.com>
parent 27b67c92

drivers/video/omap2/dss/venc.c

+1 −14
Original line number Diff line number Diff line
@@ -479,12 +479,6 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) 
		goto err1;

	}



	if (dssdev->platform_enable) {

		r = dssdev->platform_enable(dssdev);

		if (r)

			goto err2;

	}



	venc_power_on(dssdev);



	venc.wss_data = 0;
@@ -494,13 +488,9 @@ static int venc_panel_enable(struct omap_dss_device *dssdev) 
	/* wait couple of vsyncs until enabling the LCD */

	msleep(50);



	mutex_unlock(&venc.venc_lock);



	return r;

err2:

	venc_power_off(dssdev);

err1:

	mutex_unlock(&venc.venc_lock);



	return r;

}
@@ -524,9 +514,6 @@ static void venc_panel_disable(struct omap_dss_device *dssdev) 
	/* wait at least 5 vsyncs after disabling the LCD */

	msleep(100);



	if (dssdev->platform_disable)

		dssdev->platform_disable(dssdev);



	dssdev->state = OMAP_DSS_DISPLAY_DISABLED;

end:

	mutex_unlock(&venc.venc_lock);