]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
drivers: soc_camera: give default hdr_en
authorFrank Shi <fshi@nvidia.com>
Fri, 11 Dec 2015 08:43:33 +0000 (16:43 +0800)
committermobile promotions <svcmobile_promotions@nvidia.com>
Mon, 14 Dec 2015 23:58:15 +0000 (15:58 -0800)
Some sensor driver may not have HDR_EN ctrl.
It's not a fatal error. Just give a default value 0
to it.

Bug 1579861

Change-Id: I8b970cf17184edb18cd18dc8269b13ecbda6f7e4
Signed-off-by: Frank Shi <fshi@nvidia.com>
Reviewed-on: http://git-master/r/921824
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: David Wang (SW-TEGRA) <davidw@nvidia.com>
Reviewed-by: Jihoon Bang <jbang@nvidia.com>
drivers/media/platform/soc_camera/camera_common.c

index 2ffc5e484c53ff62a5e21bf404df8ce28e5a6f91..435427806a6ecc0193b1b855152a7886fd7e5a84 100644 (file)
@@ -268,8 +268,8 @@ int camera_common_try_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
 
        err = v4l2_g_ctrl(s_data->ctrl_handler, &hdr_control);
        if (err < 0) {
-               dev_err(&client->dev, "could not find device ctrl.\n");
-               return err;
+               dev_dbg(&client->dev, "could not find device ctrl.\n");
+               hdr_control.value = 0;
        }
 
        hdr_en = switch_ctrl_qmenu[hdr_control.value];