diff options
author | Archit Taneja <archit@ti.com> | 2010-07-14 08:11:50 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-08-05 09:52:18 -0400 |
commit | e9c31afcffe3df90ebac343611b2f0177bf3cbe4 (patch) | |
tree | 55e39a6548c780427b9b870e84d780c3f440f5f5 /drivers | |
parent | 451cfbfc27b45a4aebd1e536f2b79c8b7113fbc9 (diff) |
OMAP: DSS2: Fix error path in omap_dsi_update()
In the case of an error on calling dsi_update_screen_l4(), a
successful framedone callback is still sent to panel-taal. An
error should be returned to taal_update() instead.
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/omap2/dss/dsi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index a6e0f647554b..b3fa3a7db911 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c | |||
@@ -2920,7 +2920,12 @@ int omap_dsi_update(struct omap_dss_device *dssdev, | |||
2920 | 2920 | ||
2921 | dsi_update_screen_dispc(dssdev, x, y, w, h); | 2921 | dsi_update_screen_dispc(dssdev, x, y, w, h); |
2922 | } else { | 2922 | } else { |
2923 | dsi_update_screen_l4(dssdev, x, y, w, h); | 2923 | int r; |
2924 | |||
2925 | r = dsi_update_screen_l4(dssdev, x, y, w, h); | ||
2926 | if (r) | ||
2927 | return r; | ||
2928 | |||
2924 | dsi_perf_show("L4"); | 2929 | dsi_perf_show("L4"); |
2925 | callback(0, data); | 2930 | callback(0, data); |
2926 | } | 2931 | } |