Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d4eac63 authored by Shilpa Mamidi's avatar Shilpa Mamidi
Browse files

msm: cpp: Adding null check for regulator disable 



Adding null check before regulator enable and also
resetting regulator variable to NULL after regulator disable.
This will avoid using previously disabled regulator in next
session.

Change-Id: I0e8f2f71152064972128f707653e3a2295e1d408
Signed-off-by: default avatarShilpa Mamidi <shilpam@codeaurora.org>
parent b72575d0

drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

+11 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1189,17 +1189,22 @@ remap_failed: 
	msm_cam_clk_enable(&cpp_dev->pdev->dev, cpp_clk_info,

		cpp_dev->cpp_clk, cpp_dev->num_clk, 0);

clk_failed:

	if (cpp_dev->fs_cpp) {

		regulator_disable(cpp_dev->fs_cpp);

		regulator_put(cpp_dev->fs_cpp);

		cpp_dev->fs_cpp = NULL;

	}

fs_failed:

	if (cpp_dev->fs_camss) {

		regulator_disable(cpp_dev->fs_camss);

		regulator_put(cpp_dev->fs_camss);

		cpp_dev->fs_camss = NULL;

	}

fs_camss_failed:

	if (cpp_dev->fs_mmagic_camss) {

		regulator_disable(cpp_dev->fs_mmagic_camss);

		regulator_put(cpp_dev->fs_mmagic_camss);

		cpp_dev->fs_mmagic_camss = NULL;

	}

fs_mmagic_failed:

	if (cpp_dev->bus_master_flag)
@@ -4330,6 +4335,9 @@ static int cpp_probe(struct platform_device *pdev) 
	setup_timer(&cpp_timer.cpp_timer,

		cpp_timer_callback, (unsigned long)&cpp_timer);

	cpp_dev->fw_name_bin = NULL;

	cpp_dev->fs_cpp = NULL;

	cpp_dev->fs_camss = NULL;

	cpp_dev->fs_mmagic_camss = NULL;

	cpp_dev->max_timeout_trial_cnt = MSM_CPP_MAX_TIMEOUT_TRIAL;

	if (rc == 0)

		CPP_DBG("SUCCESS.");