]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
vidoe: tegra: dsi: fix warnings for dsi regulator
authorJon Mayo <jmayo@nvidia.com>
Fri, 8 Nov 2013 20:31:22 +0000 (12:31 -0800)
committerJon Mayo <jmayo@nvidia.com>
Mon, 11 Nov 2013 22:40:47 +0000 (14:40 -0800)
Fix warnings for regulator_enable() and avdd_dsi_csi.

Change-Id: I0ff0af7ef05fb09836394c50b699caedeef26d00
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-on: http://git-master/r/328428
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Animesh Kishore <ankishore@nvidia.com>
drivers/video/tegra/dc/dsi.c

index dcf6e049028927fa4f5216e57fcce02898bdea7b..4a4df26575759cff641e7cb56cde36182bd3774d 100644 (file)
@@ -2406,8 +2406,12 @@ static int tegra_dsi_init_hw(struct tegra_dc *dc,
                                struct tegra_dc_dsi_data *dsi)
 {
        u32 i;
+       int err = 0;
 
-       regulator_enable(dsi->avdd_dsi_csi);
+       if (dsi->avdd_dsi_csi)
+               err = regulator_enable(dsi->avdd_dsi_csi);
+       if (WARN(err, "unable to enable regulator"))
+               return err;
        /* stablization delay */
        mdelay(50);
        /* Enable DSI clocks */
@@ -3632,7 +3636,11 @@ static void tegra_dsi_send_dc_frames(struct tegra_dc *dc,
 
 static void tegra_dsi_setup_initialized_panel(struct tegra_dc_dsi_data *dsi)
 {
-       regulator_enable(dsi->avdd_dsi_csi);
+       int err = 0;
+
+       if (dsi->avdd_dsi_csi)
+               err = regulator_enable(dsi->avdd_dsi_csi);
+       WARN(err, "unable to enable regulator");
 
        dsi->status.init = DSI_MODULE_INIT;
        dsi->status.lphs = DSI_LPHS_IN_HS_MODE;