瀏覽代碼

Merge "msm: camera: common: Change judgement condition" into camera-kernel.lnx.5.0

Camera Software Integration 3 年之前
父節點
當前提交
60fe99a6d3
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/cam_utils/cam_soc_icc.c

+ 2 - 2
drivers/cam_utils/cam_soc_icc.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-License-Identifier: GPL-2.0-only
 /*
 /*
- * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
  */
  */
 
 
 #include <linux/interconnect.h>
 #include <linux/interconnect.h>
@@ -103,7 +103,7 @@ int cam_soc_bus_client_register(struct platform_device *pdev,
 	bus_client_data->icc_data = icc_get(&pdev->dev,
 	bus_client_data->icc_data = icc_get(&pdev->dev,
 		bus_client->common_data->src_id,
 		bus_client->common_data->src_id,
 		bus_client->common_data->dst_id);
 		bus_client->common_data->dst_id);
-	if (!bus_client_data->icc_data) {
+	if (IS_ERR_OR_NULL(bus_client_data->icc_data)) {
 		CAM_ERR(CAM_UTIL, "failed in register bus client");
 		CAM_ERR(CAM_UTIL, "failed in register bus client");
 		rc = -EINVAL;
 		rc = -EINVAL;
 		goto error;
 		goto error;