Merge "msm: camera_v2: cci: check for NULL pointer"
diff --git a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
index 4e1f73e..e072e53 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
@@ -631,7 +631,11 @@
static int msm_cci_subdev_g_chip_ident(struct v4l2_subdev *sd,
struct v4l2_dbg_chip_ident *chip)
{
- BUG_ON(!chip);
+ if (!chip) {
+ pr_err("%s:%d: NULL pointer supplied for chip ident\n",
+ __func__, __LINE__);
+ return -EINVAL;
+ }
chip->ident = V4L2_IDENT_CCI;
chip->revision = 0;
return 0;