fix for the .25 series

diff --git a/review-2.6.25/pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch b/review-2.6.25/pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch
new file mode 100644 (file)
index 0000000..75eda75
--- /dev/null
+++ b/review-2.6.25/pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch
@@ -0,0 +1,29 @@
+From 4fe16897c59882420d66f2d503106653d026ed6c Mon Sep 17 00:00:00 2001
+From: Karl Beldan <karl.beldan@gmail.com>
+Date: Wed, 16 Jul 2008 18:29:11 +0200
+Subject: pxamci: trivial fix of DMA alignment register bit clearing
+
+From: Karl Beldan <karl.beldan@gmail.com>
+
+commit 4fe16897c59882420d66f2d503106653d026ed6c upstream
+
+Signed-off-by: Karl Beldan <karl.beldan@gmail.com>
+Acked-by: Eric Miao <eric.miao@marvell.com>
+Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/mmc/host/pxamci.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/mmc/host/pxamci.c
++++ b/drivers/mmc/host/pxamci.c
+@@ -177,7 +177,7 @@ static void pxamci_setup_data(struct pxa
+       if (dalgn)
+               DALGN |= (1 << host->dma);
+       else
+-              DALGN &= (1 << host->dma);
++              DALGN &= ~(1 << host->dma);
+       DDADR(host->dma) = host->sg_dma;
+       DCSR(host->dma) = DCSR_RUN;
+ }

diff --git a/review-2.6.25/series b/review-2.6.25/series
index 7d017622e88185c70bb195221da9ebd687e350ea..7db865092b7a97ab794975a2421d6c673618438d 100644 (file)
--- a/review-2.6.25/series
+++ b/review-2.6.25/series
@@ -42,6 +42,7 @@ scsi-mptspi-fix-oops-in-mptspi_dv_renegotiate_work.patch
 crypto-chainiv-invoke-completion-function.patch
 powerpc-add-missing-reference-to-coherent_dma_mask.patch
 pxamci-fix-byte-aligned-dma-transfers.patch
+pxamci-trivial-fix-of-dma-alignment-register-bit-clearing.patch
 mmc-don-t-use-dma-on-newer-ene-controllers.patch
 hrtimer-prevent-migration-for-raising-softirq.patch
 v4l-dvb-added-support-for-terratec-cinergy-t-usb-xxs.patch