diff options
| author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-08 16:21:28 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-24 14:31:26 +0200 |
| commit | 1a75ef422d0d1319bc0fab66b0bf339069519d8c (patch) | |
| tree | b79c0ec7e84912c87d92e6a6aef0cfeb800d1270 /drivers/video/omap2/displays/panel-taal.c | |
| parent | 1bbb275e261eb204795d4a48b3e485f2ad3d627c (diff) | |
| download | blackbird-obmc-linux-1a75ef422d0d1319bc0fab66b0bf339069519d8c.tar.gz blackbird-obmc-linux-1a75ef422d0d1319bc0fab66b0bf339069519d8c.zip | |
OMAP: DSS2: move run_test()
Move run_test() from omap_dss_device to omap_dss_driver.
This is part of a larger patch-set, which moves the control from omapdss
driver to the display driver.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/displays/panel-taal.c')
| -rw-r--r-- | drivers/video/omap2/displays/panel-taal.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 0aaaa8a8e0f5..e6d0954f459f 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c @@ -820,17 +820,23 @@ static int taal_run_test(struct omap_dss_device *dssdev, int test_num) u8 id1, id2, id3; int r; + dsi_bus_lock(); + r = taal_dcs_read_1(DCS_GET_ID1, &id1); if (r) - return r; + goto err; r = taal_dcs_read_1(DCS_GET_ID2, &id2); if (r) - return r; + goto err; r = taal_dcs_read_1(DCS_GET_ID3, &id3); if (r) - return r; + goto err; + dsi_bus_unlock(); return 0; +err: + dsi_bus_unlock(); + return r; } static int taal_memory_read(struct omap_dss_device *dssdev, |
