Merge "msm_serial_hs: Manage clock path-vote correctly" (14fd60c9) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/tty/serial/msm_serial_hs.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -447,11 +447,12 @@ static void msm_hs_clock_unvote(struct msm_hs_port *msm_uport)

		rc = atomic_dec_return(&msm_uport->clk_count);
		if (0 == rc) {
		msm_hs_bus_voting(msm_uport, BUS_RESET);
		/* Turn off the core clk and iface clk*/
		clk_disable_unprepare(msm_uport->clk);
		if (msm_uport->pclk)
		clk_disable_unprepare(msm_uport->pclk);
		/* Unvote the PNOC clock */
		msm_hs_bus_voting(msm_uport, BUS_RESET);
		msm_uport->clk_state = MSM_HS_CLK_OFF;
		}
		}
		@@ -2177,8 +2178,6 @@ static int msm_hs_check_clock_off(struct uart_port *uport)

		spin_unlock_irqrestore(&uport->lock, flags);

		/* Reset PNOC Bus Scaling */
		msm_hs_bus_voting(msm_uport, BUS_RESET);
		mutex_unlock(&msm_uport->clk_mutex);

		return 1;