diff options
| author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-03-01 13:52:10 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-03-01 14:22:57 +0200 |
| commit | 1189b7ff6485ebf1039440c34150360fab7cfb01 (patch) | |
| tree | 36bfaf20278ad00f6a76c2afe9f82c9040de4abe | |
| parent | a4c1a148a0c4c690b95938e9577be9e461bc5e5a (diff) | |
| download | linux-1189b7ff6485ebf1039440c34150360fab7cfb01.tar.gz linux-1189b7ff6485ebf1039440c34150360fab7cfb01.tar.bz2 linux-1189b7ff6485ebf1039440c34150360fab7cfb01.zip | |
OMAP: DSS2: Taal: Fix ESD check
Using taal_enable_te() when DSI bus was locked caused a deadlock.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index a722733106b1..2b5777621779 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -1055,8 +1055,11 @@ static void taal_esd_work(struct work_struct *work) } /* Self-diagnostics result is also shown on TE GPIO line. We need * to re-enable TE after self diagnostics */ - if (td->use_ext_te && td->te_enabled) - taal_enable_te(dssdev, true); + if (td->use_ext_te && td->te_enabled) { + r = taal_dcs_write_1(DCS_TEAR_ON, 0); + if (r) + goto err; + } dsi_bus_unlock(); |