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

Commit 1991d22c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: cpp: add a check while disabling regulator in cpp"

parents 0f95727f 48b8d169

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

+15 −9
Original line number Diff line number Diff line
@@ -1230,15 +1230,21 @@ static void cpp_release_hardware(struct cpp_device *cpp_dev) 
	iounmap(cpp_dev->camss_cpp_base);

	msm_cam_clk_enable(&cpp_dev->pdev->dev, cpp_clk_info,

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

	if (cpp_dev->fs_cpp) {

		regulator_disable(cpp_dev->fs_cpp);

		regulator_put(cpp_dev->fs_cpp);

		cpp_dev->fs_cpp = NULL;

	}

	if (cpp_dev->fs_camss) {

		regulator_disable(cpp_dev->fs_camss);

		regulator_put(cpp_dev->fs_camss);

		cpp_dev->fs_camss = NULL;

	}

	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;

	}

	if (cpp_dev->stream_cnt > 0) {

		pr_warn("stream count active\n");

		rc = msm_cpp_update_bandwidth_setting(cpp_dev, 0, 0);