Merge "msm: ispif: Fix device crash during open node" (0a212082) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+6 −6

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2019, 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
		@@ -1743,6 +1743,11 @@ static int msm_ispif_init(struct ispif_device *ispif,
		return rc;
		}

		rc = msm_camera_enable_irq(ispif->irq, 1);
		if (rc < 0) {
		pr_err("%s:Error enabling IRQs\n", __func__);
		return rc;
		}
		/* can we set to zero? */
		ispif->applied_intf_cmd[VFE0].intf_cmd = 0xFFFFFFFF;
		ispif->applied_intf_cmd[VFE0].intf_cmd1 = 0xFFFFFFFF;
		@@ -1954,9 +1959,6 @@ static int ispif_open_node(struct v4l2_subdev sd, struct v4l2_subdev_fh fh)
		rc = msm_ispif_clk_ahb_enable(ispif, 1);
		if (rc)
		goto ahb_clk_enable_fail;
		rc = msm_camera_enable_irq(ispif->irq, 1);
		if (rc)
		goto irq_enable_fail;
		}
		/* mem remap is done in init when the clock is on */
		ispif->open_cnt++;
		@@ -1964,8 +1966,6 @@ static int ispif_open_node(struct v4l2_subdev sd, struct v4l2_subdev_fh fh)
		return rc;
		ahb_clk_enable_fail:
		msm_ispif_set_regulators(ispif->ispif_vdd, ispif->ispif_vdd_count, 0);
		irq_enable_fail:
		msm_ispif_clk_ahb_enable(ispif, 0);
		unlock:
		mutex_unlock(&ispif->mutex);
		return rc;