mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

OMAP: DSS2: Taal: Ensure panel is enabled in enable_te() and run_test()

Browse source 
Bail out from taal_enable_te() and taal_run_test() if panel is not
enabled.

Signed-off-by: Jani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
This commit is contained in:
Jani Nikula 2010-04-12 09:36:05 +03:00 committed by Tomi Valkeinen
parent f2a8b75c13
commit ee52c0ae68
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/video/omap2/displays/panel-taal.c
View file

@ -946,11 +946,8 @@ static int taal_sync(struct omap_dss_device *dssdev)
static int _taal_enable_te(struct omap_dss_device *dssdev, bool enable)
{
struct taal_data *td = dev_get_drvdata(&dssdev->dev);
int r;
td->te_enabled = enable;
if (enable)
r = taal_dcs_write_1(DCS_TEAR_ON, 0);
else
@ -973,8 +970,19 @@ static int taal_enable_te(struct omap_dss_device *dssdev, bool enable)
mutex_lock(&td->lock);
dsi_bus_lock();
r = _taal_enable_te(dssdev, enable);
if (td->enabled) {
r = _taal_enable_te(dssdev, enable);
if (r)
goto err;
}
td->te_enabled = enable;
dsi_bus_unlock();
mutex_unlock(&td->lock);
return 0;
err:
dsi_bus_unlock();
mutex_unlock(&td->lock);
@ -1077,23 +1085,30 @@ static int taal_run_test(struct omap_dss_device *dssdev, int test_num)
int r;
mutex_lock(&td->lock);
if (!td->enabled) {
r = -ENODEV;
goto err1;
}
dsi_bus_lock();
r = taal_dcs_read_1(DCS_GET_ID1, &id1);
if (r)
goto err;
goto err2;
r = taal_dcs_read_1(DCS_GET_ID2, &id2);
if (r)
goto err;
goto err2;
r = taal_dcs_read_1(DCS_GET_ID3, &id3);
if (r)
goto err;
goto err2;
dsi_bus_unlock();
mutex_unlock(&td->lock);
return 0;
err:
err2:
dsi_bus_unlock();
err1:
mutex_unlock(&td->lock);
return r;
}