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

Commit c7edc1c4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Added error handling in clock data structure"

parents a1ae5723 cc578218

drivers/media/platform/msm/vidc/msm_vidc_clocks.c

+6 −0
Original line number Diff line number Diff line
@@ -1021,6 +1021,12 @@ int msm_comm_init_clocks_and_bus_data(struct msm_vidc_inst *inst) 
			break;

		}

	}



	if (!inst->clk_data.entry) {

		dprintk(VIDC_ERR, "%s No match found\n", __func__);

		rc = -EINVAL;

	}



	return rc;

}

drivers/media/platform/msm/vidc/msm_vidc_common.c

+5 −1
Original line number Diff line number Diff line
@@ -3259,7 +3259,11 @@ static int msm_comm_session_init(int flipped_state, 
		return -EINVAL;

	}



	msm_comm_init_clocks_and_bus_data(inst);

	rc = msm_comm_init_clocks_and_bus_data(inst);

	if (rc) {

		dprintk(VIDC_ERR, "Failed to initialize clocks and bus data\n");

		goto exit;

	}



	dprintk(VIDC_DBG, "%s: inst %pK\n", __func__, inst);

	rc = call_hfi_op(hdev, session_init, hdev->hfi_device_data,