Patch "ASoC: davinci-mcasp: Fix XDATA check in mcasp_start_tx" has been added to the 4.1-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-01-26 02:47:11
This is a note to let you know that I've just added the patch titled
ASoC: davinci-mcasp: Fix XDATA check in mcasp_start_tx
to the 4.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-davinci-mcasp-fix-xdata-check-in-mcasp_start_tx.patch
and it can be found in the queue-4.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From e2a0c9fa80227be5ee017b5476638829dd41cb39 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <redacted>
Date: Fri, 11 Dec 2015 13:06:24 +0200
Subject: ASoC: davinci-mcasp: Fix XDATA check in mcasp_start_tx
From: Peter Ujfalusi <redacted>
commit e2a0c9fa80227be5ee017b5476638829dd41cb39 upstream.
The condition for checking for XDAT being cleared was not correct.
Fixes: 36bcecd0a73eb ("ASoC: davinci-mcasp: Correct TX start sequence")
Signed-off-by: Peter Ujfalusi <redacted>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/davinci/davinci-mcasp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c@@ -221,8 +221,8 @@ static void mcasp_start_tx(struct davinc /* wait for XDATA to be cleared */ cnt = 0; - while (!(mcasp_get_reg(mcasp, DAVINCI_MCASP_TXSTAT_REG) & - ~XRDATA) && (cnt < 100000)) + while ((mcasp_get_reg(mcasp, DAVINCI_MCASP_TXSTAT_REG) & XRDATA) && + (cnt < 100000)) cnt++; /* Release TX state machine */
Patches currently in stable-queue which might be from peter.ujfalusi@ti.com are queue-4.1/asoc-davinci-mcasp-fix-xdata-check-in-mcasp_start_tx.patch