Patch "spi/spi-xilinx: Fix mixed poll/irq mode" has been added to the 4.2-stable tree

This is a note to let you know that I've just added the patch titled

spi/spi-xilinx: Fix mixed poll/irq mode

to the 4.2-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:
spi-spi-xilinx-fix-mixed-poll-irq-mode.patch
and it can be found in the queue-4.2 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 12 Aug 2015 18:04:04 +0200
Subject: spi/spi-xilinx: Fix mixed poll/irq mode

From: Ricardo Ribalda Delgado <[email protected]>

commit 16ea9b8ac45bf11d48af6013283e141e8ed86348 upstream.

Once the module process a transfer in irq mode, the next poll transfer will not work because the transmitter is left in inhibited state.

---
 drivers/spi/spi-xilinx.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

@@ -306,8 +306,10 @@ static int xilinx_spi_txrx_bufs(struct s
 		remaining_words -= n_words;
 	}
 
-	if (use_irq)
+	if (use_irq) {
 		xspi->write_fn(0, xspi->regs + XIPIF_V123B_DGIER_OFFSET);
+		xspi->write_fn(cr, xspi->regs + XSPI_CR_OFFSET);
+	}
 
 	return t->len;
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.2/spi-spi-xilinx-fix-mixed-poll-irq-mode.patch queue-4.2/spi-spi-xilinx-fix-spurious-irq-ack-on-irq-mode.patch