1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From b46425082619fb329b56f7628ee5c196d7301bd3 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Tue, 30 Jun 2009 11:43:56 +0300
Subject: [PATCH 131/146] DSS2: DSI: check dsi_set_te() return value
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
---
drivers/video/omap2/dss/dsi.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 45df3f7..03cf2d6 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -3003,7 +3003,9 @@ static int dsi_display_enable(struct omap_dss_device *dssdev)
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
dsi.use_ext_te = dssdev->phy.dsi.ext_te;
- dsi_set_te(dssdev, dsi.te_enabled);
+ r = dsi_set_te(dssdev, dsi.te_enabled);
+ if (r)
+ goto err3;
dsi.update_mode = dsi.user_update_mode;
if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO)
@@ -3116,7 +3118,9 @@ static int dsi_display_resume(struct omap_dss_device *dssdev)
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
- dsi_set_te(dssdev, dsi.te_enabled);
+ r = dsi_set_te(dssdev, dsi.te_enabled);
+ if (r)
+ goto err2;
dsi.update_mode = dsi.user_update_mode;
if (dsi.update_mode == OMAP_DSS_UPDATE_AUTO)
@@ -3238,6 +3242,8 @@ static enum omap_dss_update_mode dsi_display_get_update_mode(
static int dsi_display_enable_te(struct omap_dss_device *dssdev, bool enable)
{
+ int r = 0;
+
DSSDBGF("%d", enable);
if (!dssdev->driver->enable_te)
@@ -3250,11 +3256,11 @@ static int dsi_display_enable_te(struct omap_dss_device *dssdev, bool enable)
if (dssdev->state != OMAP_DSS_DISPLAY_ACTIVE)
goto end;
- dsi_set_te(dssdev, enable);
+ r = dsi_set_te(dssdev, enable);
end:
dsi_bus_unlock();
- return 0;
+ return r;
}
static int dsi_display_get_te(struct omap_dss_device *dssdev)
--
1.6.2.4
|
