commit 402955bf8fb9587538597ee897777a14f957afc5
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 08 02:48:45 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 08 02:48:45 2013 -0700
tree 3bf477cf5a45fbe8da980157dafd3b1daf3370e8
parent 8dd681cd2b6c46c0eae34e583752fd29d760a820
parent af635184d091c24db2761fcd39dd03b9d4ba125e

Merge "ASoC: msm: qdsp6v2: Fix MI2S channel mapping"

sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c

diff --git a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
index 1b789cd..8bb3eaf 100644
--- a/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
@@ -1864,8 +1864,8 @@
 
 	if (ch_cnt) {
 		dai_data->rx_dai.mi2s_dai_data.port_config.i2s.channel_mode =
-				mi2s_pdata->rx_sd_lines;
-		dai_data->rx_dai.pdata_mi2s_lines = mi2s_pdata->rx_sd_lines;
+		sd_line;
+		dai_data->rx_dai.pdata_mi2s_lines = sd_line;
 		dai_driver->playback.channels_min = 1;
 		dai_driver->playback.channels_max = ch_cnt << 1;
 	} else {
@@ -1882,8 +1882,8 @@
 
 	if (ch_cnt) {
 		dai_data->tx_dai.mi2s_dai_data.port_config.i2s.channel_mode =
-			mi2s_pdata->tx_sd_lines;
-		dai_data->tx_dai.pdata_mi2s_lines = mi2s_pdata->tx_sd_lines;
+		sd_line;
+		dai_data->tx_dai.pdata_mi2s_lines = sd_line;
 		dai_driver->capture.channels_min = 1;
 		dai_driver->capture.channels_max = ch_cnt << 1;
 	} else {