Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f182dbf0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: isp: Fix for few code warnings"

parents 170c54ba 3e4571e8

drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c

+2 −2
Original line number Diff line number Diff line
@@ -1705,7 +1705,7 @@ static int msm_isp_process_done_buf(struct vfe_device *vfe_dev, 
	struct msm_vfe_axi_stream *stream_info, struct msm_isp_buffer *buf,

	struct timeval *time_stamp, uint32_t frame_id)

{

	int rc, ret;

	int rc = 0, ret = 0;

	unsigned long flags;

	struct msm_isp_event_data buf_event;

	uint32_t stream_idx = HANDLE_TO_IDX(stream_info->stream_handle);
@@ -2402,7 +2402,7 @@ static int msm_isp_update_dual_HW_ms_info_at_stop( 
static int msm_isp_update_dual_HW_axi(struct vfe_device *vfe_dev,

			struct msm_vfe_axi_stream *stream_info)

{

	int rc, vfe_id;

	int rc = 0, vfe_id;

	uint32_t stream_idx = HANDLE_TO_IDX(stream_info->stream_handle);

	struct dual_vfe_resource *dual_vfe_res = NULL;