From c342b760354de952488cfb422a0942957e08b1db Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Wed, 7 Mar 2012 11:15:37 +0200
Subject: [PATCH] --- yaml --- r: 293480 b: refs/heads/master c:
 73c9522e76d7147d99ff859699405a9af81fec72 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/sound/soc/omap/mcbsp.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 510fca529c85..70de2f5ba4e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e386615c01d37145aa27fd06d1f8de26f1acbb7f
+refs/heads/master: 73c9522e76d7147d99ff859699405a9af81fec72
diff --git a/trunk/sound/soc/omap/mcbsp.c b/trunk/sound/soc/omap/mcbsp.c
index 21dbb0532bca..c3e31deafa07 100644
--- a/trunk/sound/soc/omap/mcbsp.c
+++ b/trunk/sound/soc/omap/mcbsp.c
@@ -958,8 +958,10 @@ int __devinit omap_mcbsp_init(struct platform_device *pdev)
 	mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx");
 
 	/* From OMAP4 there will be a single irq line */
-	if (mcbsp->tx_irq == -ENXIO)
+	if (mcbsp->tx_irq == -ENXIO) {
 		mcbsp->tx_irq = platform_get_irq(pdev, 0);
+		mcbsp->rx_irq = 0;
+	}
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");
 	if (!res) {