diff options
| author | Mikael Larsson <mikael.xt.larsson@stericsson.com> | 2010-10-19 17:32:28 +0200 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-10-20 09:14:27 +0200 |
| commit | c32970bd4b99a3569cad6076b6a66efc41699945 (patch) | |
| tree | 78125a2ce768eb2ea0eb3d1e1f6b9af2335f2b2e /board | |
| parent | dacf59f8acd38c3bfc027279a70bf556c92ac309 (diff) | |
Fix double free in mcde
This fixes double free in mcde code.
Change-Id: I74150e4bea161313aa3298710dd8899db25501be
Signed-off-by: Mikael Larsson <mikael.xt.larsson@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/6854
Reviewed-by: Torbjorn SVENSSON <torbjorn.x.svensson@stericsson.com>
Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/st/u8500/mcde_display.c | 2 | ||||
| -rw-r--r-- | board/st/u8500/mcde_hw.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/board/st/u8500/mcde_display.c b/board/st/u8500/mcde_display.c index f3aa24bb9..70d1cb9b0 100644 --- a/board/st/u8500/mcde_display.c +++ b/board/st/u8500/mcde_display.c @@ -311,6 +311,8 @@ int mcde_startup(void) mcde_chnl_set_pixel_format(chnl, main_display.port_pixel_format); mcde_chnl_apply(chnl); + return ret; + display_power_mode_failed: get_chnl_failed: display_power_failed: diff --git a/board/st/u8500/mcde_hw.c b/board/st/u8500/mcde_hw.c index a858e67aa..ed85c5b79 100644 --- a/board/st/u8500/mcde_hw.c +++ b/board/st/u8500/mcde_hw.c @@ -874,6 +874,8 @@ int mcde_init(u8 num_data_lanes) void mcde_exit(void) { - if (dsiio) + if (dsiio) { free(dsiio); + dsiio = NULL; + } } |