diff options
author | Loren Huang <b02279@freescale.com> | 2012-04-24 12:21:24 +0800 |
---|---|---|
committer | Jason Liu <r64343@freescale.com> | 2012-07-20 13:36:32 +0800 |
commit | 2978a182258f896d950194aff970a7131829594c (patch) | |
tree | 6c6d7d10be22c6c455137635a34ed2ff338dcbd8 /drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c | |
parent | 1c81be6a539289ba20c2ab8225c4e98253aff91f (diff) |
ENGR00180624 Merge vivante 4.6.7p1 kernel part code
Merge vivante 4.6.7p1 kernel part code
Signed-off-by: Loren Huang <b02279@freescale.com>
Acked-by: Lily Zhang
Diffstat (limited to 'drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c')
-rw-r--r-- | drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c index 288b330ad61f..88e4d7705bd8 100644 --- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c +++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_video_memory.c @@ -1246,7 +1246,7 @@ gckVIDMEM_Free( gckVIDMEM memory = gcvNULL; gcuVIDMEM_NODE_PTR node; gctBOOL mutexAcquired = gcvFALSE; - gckOS os = gcvFALSE; + gckOS os = gcvNULL; gctBOOL acquired = gcvFALSE; gctINT32 i, totalLocked; |