commit 2dac08c977cf05e6a5dcd4acf2629de0704e8dcf
author Linux Build Service Account <lnxbuild@quicinc.com> Thu Oct 05 03:59:37 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Oct 05 03:59:37 2017 -0700
tree bf9e126c7a81d7489240cd49938a7c34de234912
parent a04c9614ab8484584f1a98c4376bb49b1db59e2d
parent cb75d25f002e8a71aebbf518eb268773445caaa4

Merge "msm: vidc: Add NULL check for bus vote data allocation"

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

diff --git a/drivers/media/platform/msm/vidc/venus_hfi.c b/drivers/media/platform/msm/vidc/venus_hfi.c
index 5d2ed29..e260886 100644
--- a/drivers/media/platform/msm/vidc/venus_hfi.c
+++ b/drivers/media/platform/msm/vidc/venus_hfi.c
@@ -1693,6 +1693,12 @@
 
 	dev->bus_vote.data =
 		kzalloc(sizeof(struct vidc_bus_vote_data), GFP_KERNEL);
+	if (!dev->bus_vote.data) {
+		dprintk(VIDC_ERR, "Bus vote data memory is not allocated\n");
+		rc = -ENOMEM;
+		goto err_no_mem;
+	}
+
 	dev->bus_vote.data_count = 1;
 	dev->bus_vote.data->power_mode = VIDC_POWER_TURBO;
 
@@ -1769,6 +1775,7 @@
 	__set_state(dev, VENUS_STATE_DEINIT);
 	__unload_fw(dev);
 err_load_fw:
+err_no_mem:
 	dprintk(VIDC_ERR, "Core init failed\n");
 	mutex_unlock(&dev->lock);
 	return rc;