Browse Source

Merge "msm: camera: smmu: Avoid NULL dereference in cam_smmu_alloc_firmware" into camera-kernel.lnx.4.0

Haritha Chintalapati 4 years ago
parent
commit
ce4e3d7296
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/cam_smmu/cam_smmu_api.c

+ 1 - 1
drivers/cam_smmu/cam_smmu_api.c

@@ -3552,7 +3552,7 @@ static int cam_smmu_setup_cb(struct cam_context_bank_info *cb,
 	/* create a virtual mapping */
 	if (cb->io_support) {
 		cb->domain = iommu_get_domain_for_dev(dev);
-		if (IS_ERR(cb->domain)) {
+		if (IS_ERR_OR_NULL(cb->domain)) {
 			CAM_ERR(CAM_SMMU, "Error: create domain Failed");
 			rc = -ENODEV;
 			goto end;