diff options
| author | Liu Ying <b17645@freescale.com> | 2009-09-22 17:41:27 +0800 |
|---|---|---|
| committer | Rob Herring <r.herring@freescale.com> | 2009-10-26 16:57:17 -0500 |
| commit | 495f0dea21abfaeb85674ea543d7378f1e44c23b (patch) | |
| tree | 8302567965dafd295b8fae3a0454f024e7923448 /drivers/video/mxc | |
| parent | bf52e5c4ff4114b3ff3cb52311a3a9a8989014c5 (diff) | |
ENGR00116699 IPUv3 FB:Memory allocation enhancement when initializing
When framebuffer is being initialized in probe, don't allocate memory
for FB if it has memory resource already.
Signed-off-by: Liu Ying <b17645@freescale.com>
Diffstat (limited to 'drivers/video/mxc')
| -rw-r--r-- | drivers/video/mxc/mxc_ipuv3_fb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c index f3ac4d208b98..279764d9a3a4 100644 --- a/drivers/video/mxc/mxc_ipuv3_fb.c +++ b/drivers/video/mxc/mxc_ipuv3_fb.c @@ -1482,8 +1482,9 @@ static int mxcfb_probe(struct platform_device *pdev) mxcfb_set_fix(fbi); /* alocate fb first */ - if (mxcfb_map_video_memory(fbi) < 0) - return -ENOMEM; + if (!res) + if (mxcfb_map_video_memory(fbi) < 0) + return -ENOMEM; ret = register_framebuffer(fbi); if (ret < 0) |