Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent

1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 0debe11b67b4..3b97803e1d11 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -142,6 +142,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
         unsigned rfalarm;
         unsigned send_at_once = MPC52xx_PSC_BUFSIZE;
         unsigned recv_at_once;
+        int last_block = 0;
 
         if (!t->tx_buf && !t->rx_buf && t->len)
                 return -EINVAL;
@@ -151,15 +152,17 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
         while (rb < t->len) {
                 if (t->len - rb > MPC52xx_PSC_BUFSIZE) {
                         rfalarm = MPC52xx_PSC_RFALARM;
+                        last_block = 0;
                 } else {
                         send_at_once = t->len - sb;
                         rfalarm = MPC52xx_PSC_BUFSIZE - (t->len - rb);
+                        last_block = 1;
                 }
 
                 dev_dbg(&spi->dev, "send %d bytes...\n", send_at_once);
                 for (; send_at_once; sb++, send_at_once--) {
                         /* set EOF flag before the last word is sent */
-                        if (send_at_once == 1)
+                        if (send_at_once == 1 && last_block)
                                 out_8(&psc->ircr2, 0x01);
 
                         if (tx_buf)