tegra: vi: Fix sparse errors

Fix sparse errors in camera common focuser
apis

Bug 200088648

Change-Id: Id6f5891da45457c1a3ee60ac6a3566535c220f23
Signed-off-by: Bhanu Murthy V <bmurthyv@nvidia.com>
Reviewed-on: http://git-master/r/924039
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Amit Sharma (SW-TEGRA) <amisharma@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>

diff --git a/drivers/media/platform/tegra/vi/camera_common.c b/drivers/media/platform/tegra/vi/camera_common.c
index 690da1cfbfb1e4cc487d6c20b75f581e107ac98c..de603464c82f9438300434f43d5c9b4467244e8e 100644 (file)
--- a/drivers/media/platform/tegra/vi/camera_common.c
+++ b/drivers/media/platform/tegra/vi/camera_common.c
@@ -582,7 +582,7 @@ int camera_common_focuser_s_power(struct v4l2_subdev *sd, int on)
                        dev_err(&s_data->i2c_client->dev,
                                "%s: error power on\n", __func__);
        } else
-               call_s_op(s_data, power_off);
+               err = call_s_op(s_data, power_off);
 
        return err;
 }
@@ -593,12 +593,19 @@ int camera_common_focuser_init(struct camera_common_focuser_data *s_data)
 
        /* power on */
        err = call_s_op(s_data, power_on);
-       if (err)
+       if (err) {
                dev_err(&s_data->i2c_client->dev,
                        "%s: error power on\n", __func__);
+               return err;
+       }
 
        /* load default configuration */
-       call_s_op(s_data, load_config);
+       err = call_s_op(s_data, load_config);
+       if (err) {
+               dev_err(&s_data->i2c_client->dev,
+                       "%s: error loading config\n", __func__);
+               goto fail;
+       }
 
        /* set controls */
        err = call_s_op(s_data, ctrls_init);
@@ -606,8 +613,9 @@ int camera_common_focuser_init(struct camera_common_focuser_data *s_data)
                dev_err(&s_data->i2c_client->dev,
                        "%s: error initializing controls\n", __func__);
 
+fail:
        /* power off */
-       call_s_op(s_data, power_off);
+       err |= call_s_op(s_data, power_off);
 
        return err;
 }