Merge "wcnss: add NULL check before accessing pnv pointer" (6cc968d5) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/net/wireless/wcnss/wcnss_wlan.c

+10 −7

Original line number	Diff line number	Diff line
		@@ -1052,17 +1052,20 @@ static void wcnss_log_iris_regs(void)
		}
		}

		void wcnss_get_mux_control(void)
		int wcnss_get_mux_control(void)
		{
		void __iomem *pmu_conf_reg;
		struct wcnss_wlan_config *cfg = wcnss_get_wlan_config();
		u32 reg = 0;

		pmu_conf_reg = cfg->msm_wcnss_base + PRONTO_PMU_OFFSET;
		if (NULL == penv)
		return 0;

		pmu_conf_reg = penv->msm_wcnss_base + PRONTO_PMU_OFFSET;
		writel_relaxed(0, pmu_conf_reg);
		reg = readl_relaxed(pmu_conf_reg);
		reg \|= WCNSS_PMU_CFG_GC_BUS_MUX_SEL_TOP;
		writel_relaxed(reg, pmu_conf_reg);
		return 1;
		}

		void wcnss_log_debug_regs_on_bite(void)
		@@ -1094,7 +1097,7 @@ void wcnss_log_debug_regs_on_bite(void)

		if (clk_rate) {
		wcnss_pronto_log_debug_regs();
		wcnss_get_mux_control();
		if (wcnss_get_mux_control())
		wcnss_log_iris_regs();
		} else {
		pr_err("clock frequency is zero, cannot access PMU or other registers\n");
		@@ -1111,7 +1114,7 @@ void wcnss_reset_intr(void)
		{
		if (wcnss_hardware_type() == WCNSS_PRONTO_HW) {
		wcnss_pronto_log_debug_regs();
		wcnss_get_mux_control();
		if (wcnss_get_mux_control())
		wcnss_log_iris_regs();
		wmb();
		__raw_writel(1 << 16, penv->fiq_reg);