Merge "drivers: mailbox: qti-tcs: Initialize all spinlocks" into msm-4.9 (7b5b08d2) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mailbox/qti-tcs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1040,6 +1040,8 @@ static int tcs_drv_probe(struct platform_device *pdev)
		tcs->ncpt = (tcs->type == CONTROL_TCS) ? TCS_HIDDEN_MAX_SLOTS
		: ncpt;
		spin_lock_init(&tcs->tcs_lock);
		for (j = 0; j < ARRAY_SIZE(tcs->tcs_m_lock); j++)
		spin_lock_init(&tcs->tcs_m_lock[j]);

		if (tcs->num_tcs <= 0 \|\| tcs->type == CONTROL_TCS)
		continue;
		@@ -1059,8 +1061,6 @@ static int tcs_drv_probe(struct platform_device *pdev)
		if (!tcs->cmd_addr)
		return -ENOMEM;

		for (j = 0; j < tcs->num_tcs; j++)
		spin_lock_init(&tcs->tcs_m_lock[j]);
		}

		/* Allocate only that many channels specified in DT for our MBOX */