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

media: atomisp: fixes build breakage for ISP2400 due to a cleanup

A temporary var needed for building with ISP2400 was removed
by accident on a cleanup patch.

Fix the breakage.

Fixes: 852a53a02cf0 ("media: atomisp: get rid of unused vars")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

+11 -3
+11 -3
drivers/staging/media/atomisp/pci/sh_css.c
··· 1365 1365 { 1366 1366 assert(pipe); 1367 1367 /* Acceleration uses firmware, the binary thus can be NULL */ 1368 - /* assert(binary != NULL); */ 1369 1368 1370 1369 if (binary) 1371 1370 sh_css_metrics_start_binary(&binary->metrics); ··· 1380 1381 #endif 1381 1382 1382 1383 #if !defined(ISP2401) 1383 - if (stream->reconfigure_css_rx) { 1384 + if (pipe->stream->reconfigure_css_rx) { 1384 1385 ia_css_isys_rx_configure(&pipe->stream->csi_rx_config, 1385 1386 pipe->stream->config.mode); 1386 - stream->reconfigure_css_rx = false; 1387 + pipe->stream->reconfigure_css_rx = false; 1387 1388 } 1388 1389 #endif 1389 1390 } ··· 2819 2820 bool need_isp_copy_binary = false; 2820 2821 #ifdef ISP2401 2821 2822 bool sensor = false; 2823 + #else 2824 + bool continuous; 2822 2825 #endif 2823 2826 /* preview only have 1 output pin now */ 2824 2827 struct ia_css_frame_info *pipe_out_info = &pipe->output_info[0]; ··· 2834 2833 online = pipe->stream->config.online; 2835 2834 #ifdef ISP2401 2836 2835 sensor = pipe->stream->config.mode == IA_CSS_INPUT_MODE_SENSOR; 2836 + #else 2837 + continuous = pipe->stream->config.continuous; 2837 2838 #endif 2838 2839 2839 2840 if (mycs->preview_binary.info) ··· 5990 5987 bool need_ldc = false; 5991 5988 #ifdef ISP2401 5992 5989 bool sensor = false; 5990 + #else 5991 + bool memory, continuous; 5993 5992 #endif 5994 5993 struct ia_css_frame_info prim_in_info, 5995 5994 prim_out_info, ··· 6014 6009 online = pipe->stream->config.online; 6015 6010 #ifdef ISP2401 6016 6011 sensor = (pipe->stream->config.mode == IA_CSS_INPUT_MODE_SENSOR); 6012 + #else 6013 + memory = pipe->stream->config.mode == IA_CSS_INPUT_MODE_MEMORY; 6014 + continuous = pipe->stream->config.continuous; 6017 6015 #endif 6018 6016 6019 6017 mycs = &pipe->pipe_settings.capture;