Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

+9 -6
+9 -6
drivers/media/platform/exynos-gsc/gsc-core.c
··· 319 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 324 if (frm->addr.y == addr) { 325 325 *index = 0; 326 - return frm->addr.y; 326 + *ret_addr = frm->addr.y; 327 327 } else if (frm->addr.cb == addr) { 328 328 *index = 1; 329 - return frm->addr.cb; 329 + *ret_addr = frm->addr.cb; 330 330 } else if (frm->addr.cr == addr) { 331 331 *index = 2; 332 - return frm->addr.cr; 332 + *ret_addr = frm->addr.cr; 333 333 } else { 334 334 pr_err("Plane address is wrong"); 335 335 return -EINVAL; 336 336 } 337 + return 0; 337 338 } 338 339 339 340 void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm) ··· 353 352 u32 t_min, t_max; 354 353 355 354 t_min = min3(frm->addr.y, frm->addr.cb, frm->addr.cr); 356 - low_addr = get_plane_info(frm, t_min, &low_plane); 355 + if (get_plane_info(frm, t_min, &low_plane, &low_addr)) 356 + return; 357 357 t_max = max3(frm->addr.y, frm->addr.cb, frm->addr.cr); 358 - high_addr = get_plane_info(frm, t_max, &high_plane); 358 + if (get_plane_info(frm, t_max, &high_plane, &high_addr)) 359 + return; 359 360 360 361 mid_plane = 3 - (low_plane + high_plane); 361 362 if (mid_plane == 0)