diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-25 10:04:16 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-04 09:50:44 -0500 |
commit | 32af858cc96b0ce588f4aeb37bf68940c727364b (patch) | |
tree | 79598208fe46f2bf1681749f0083c8f7787ba6e4 | |
parent | 2281c8244b3cbb75c557076f427c4ed8fb32b88a (diff) |
[media] media: exynos-gsc: fix build warning
Fixes following build warnings:
gsc-core.c:350:17: warning: 'low_plane' may be used uninitialized
gsc-core.c:371:31: warning: 'high_plane' may be used uninitialized
Reported-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | drivers/media/platform/exynos-gsc/gsc-core.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index 91d226b8fe5c..3062e9fac6da 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c | |||
@@ -319,21 +319,22 @@ int gsc_enum_fmt_mplane(struct v4l2_fmtdesc *f) | |||
319 | return 0; | 319 | return 0; |
320 | } | 320 | } |
321 | 321 | ||
322 | static u32 get_plane_info(struct gsc_frame *frm, u32 addr, u32 *index) | 322 | static int get_plane_info(struct gsc_frame *frm, u32 addr, u32 *index, u32 *ret_addr) |
323 | { | 323 | { |
324 | if (frm->addr.y == addr) { | 324 | if (frm->addr.y == addr) { |
325 | *index = 0; | 325 | *index = 0; |
326 | return frm->addr.y; | 326 | *ret_addr = frm->addr.y; |
327 | } else if (frm->addr.cb == addr) { | 327 | } else if (frm->addr.cb == addr) { |
328 | *index = 1; | 328 | *index = 1; |
329 | return frm->addr.cb; | 329 | *ret_addr = frm->addr.cb; |
330 | } else if (frm->addr.cr == addr) { | 330 | } else if (frm->addr.cr == addr) { |
331 | *index = 2; | 331 | *index = 2; |
332 | return frm->addr.cr; | 332 | *ret_addr = frm->addr.cr; |
333 | } else { | 333 | } else { |
334 | pr_err("Plane address is wrong"); | 334 | pr_err("Plane address is wrong"); |
335 | return -EINVAL; | 335 | return -EINVAL; |
336 | } | 336 | } |
337 | return 0; | ||
337 | } | 338 | } |
338 | 339 | ||
339 | void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm) | 340 | void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm) |
@@ -352,9 +353,11 @@ void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm) | |||
352 | u32 t_min, t_max; | 353 | u32 t_min, t_max; |
353 | 354 | ||
354 | t_min = min3(frm->addr.y, frm->addr.cb, frm->addr.cr); | 355 | t_min = min3(frm->addr.y, frm->addr.cb, frm->addr.cr); |
355 | low_addr = get_plane_info(frm, t_min, &low_plane); | 356 | if (get_plane_info(frm, t_min, &low_plane, &low_addr)) |
357 | return; | ||
356 | t_max = max3(frm->addr.y, frm->addr.cb, frm->addr.cr); | 358 | t_max = max3(frm->addr.y, frm->addr.cb, frm->addr.cr); |
357 | high_addr = get_plane_info(frm, t_max, &high_plane); | 359 | if (get_plane_info(frm, t_max, &high_plane, &high_addr)) |
360 | return; | ||
358 | 361 | ||
359 | mid_plane = 3 - (low_plane + high_plane); | 362 | mid_plane = 3 - (low_plane + high_plane); |
360 | if (mid_plane == 0) | 363 | if (mid_plane == 0) |