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

Commit d76320bc authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: sensor: Fix an operator error" into camera-kernel.lnx.3.1

parents b4c64fbb 83946419

drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -1319,8 +1319,8 @@ int32_t cam_sensor_flush_request(struct cam_req_mgr_flush_request *flush_req) 
	}



	mutex_lock(&(s_ctrl->cam_sensor_mutex));

	if (s_ctrl->sensor_state != CAM_SENSOR_START ||

		s_ctrl->sensor_state != CAM_SENSOR_CONFIG) {

	if ((s_ctrl->sensor_state != CAM_SENSOR_START) &&

		(s_ctrl->sensor_state != CAM_SENSOR_CONFIG)) {

		mutex_unlock(&(s_ctrl->cam_sensor_mutex));

		return rc;

	}