X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fspi%2Fspi-pxa2xx.c;h=2ecc2d6464fbdd726a7425a69eb5872c1873687e;hb=a5a3182e50b5be88efd01050ba6f35e2d0aaee03;hp=dc25bee8d33f1d6f93deea0030712a681579b1d0;hpb=0a7a0519d1789f3a222849421dbe91b6bddb88f5;p=pandora-kernel.git

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index dc25bee8d33f..2ecc2d6464fb 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -799,6 +799,10 @@ static irqreturn_t ssp_int(int irq, void *dev_id)
 	if (!(sccr1_reg & SSCR1_TIE))
 		mask &= ~SSSR_TFS;
 
+	/* Ignore RX timeout interrupt if it is disabled */
+	if (!(sccr1_reg & SSCR1_TINTE))
+		mask &= ~SSSR_TINT;
+
 	if (!(status & mask))
 		return IRQ_NONE;