commit 6e2658c456f683e675b24e6da972f866952820d5
author Linux Build Service Account <lnxbuild@localhost> Mon Jul 22 03:38:42 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jul 22 03:38:41 2013 -0700
tree fa5878a0a2bc16c55bffd5a94dfa4f22cf62e21c
parent 0b41824035a73d95daca08a76a52efce2135a0e3
parent acc1ed699a456d920eaa1c08d60a78d78c4b7f04

Merge "msm: camera: add error check in gc0339 config function"

drivers/media/platform/msm/camera_v2/sensor/gc0339.c

diff --git a/drivers/media/platform/msm/camera_v2/sensor/gc0339.c b/drivers/media/platform/msm/camera_v2/sensor/gc0339.c
index 8cba04c..cc38b56 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/gc0339.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/gc0339.c
@@ -490,6 +490,11 @@
 			break;
 		}
 
+		if (conf_array.addr_type == MSM_CAMERA_I2C_WORD_ADDR
+			|| conf_array.data_type == MSM_CAMERA_I2C_WORD_DATA
+			|| !conf_array.size)
+			break;
+
 		reg_setting = kzalloc(conf_array.size *
 			(sizeof(struct msm_camera_i2c_reg_array)), GFP_KERNEL);
 		if (!reg_setting) {