samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Camera Software Integration
2020-02-04 15:09:59 -08:00
committed by Gerrit - the friendly Code Review server
parent 7212c1deb0 9303d3ae02
commit 139893ac96
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/cam_sensor_module/cam_sensor/cam_sensor_core.c
View File

@@ -1,6 +1,6 @@
// 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;
}