|
@@ -1,6 +1,6 @@
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
|
// 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>
|
|
#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));
|
|
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));
|
|
mutex_unlock(&(s_ctrl->cam_sensor_mutex));
|
|
return rc;
|
|
return rc;
|
|
}
|
|
}
|