diff options
author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-08 09:21:28 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-24 07:31:26 -0500 |
commit | 1a75ef422d0d1319bc0fab66b0bf339069519d8c (patch) | |
tree | b79c0ec7e84912c87d92e6a6aef0cfeb800d1270 /drivers/video/omap2/displays | |
parent | 1bbb275e261eb204795d4a48b3e485f2ad3d627c (diff) |
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')
-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 0aaaa8a8e0f..e6d0954f459 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) | |||
820 | u8 id1, id2, id3; | 820 | u8 id1, id2, id3; |
821 | int r; | 821 | int r; |
822 | 822 | ||
823 | dsi_bus_lock(); | ||
824 | |||
823 | r = taal_dcs_read_1(DCS_GET_ID1, &id1); | 825 | r = taal_dcs_read_1(DCS_GET_ID1, &id1); |
824 | if (r) | 826 | if (r) |
825 | return r; | 827 | goto err; |
826 | r = taal_dcs_read_1(DCS_GET_ID2, &id2); | 828 | r = taal_dcs_read_1(DCS_GET_ID2, &id2); |
827 | if (r) | 829 | if (r) |
828 | return r; | 830 | goto err; |
829 | r = taal_dcs_read_1(DCS_GET_ID3, &id3); | 831 | r = taal_dcs_read_1(DCS_GET_ID3, &id3); |
830 | if (r) | 832 | if (r) |
831 | return r; | 833 | goto err; |
832 | 834 | ||
835 | dsi_bus_unlock(); | ||
833 | return 0; | 836 | return 0; |
837 | err: | ||
838 | dsi_bus_unlock(); | ||
839 | return r; | ||
834 | } | 840 | } |
835 | 841 | ||
836 | static int taal_memory_read(struct omap_dss_device *dssdev, | 842 | static int taal_memory_read(struct omap_dss_device *dssdev, |