The patch titled
     pata_cs5536: MWDMA fix
has been added to the -mm tree.  Its filename is
     pata_cs5536-mwdma-fix.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: pata_cs5536: MWDMA fix
From: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>

* Fix out-of-bound array access for MWDMA modes.

* Bump driver version.

Acked-by: "Martin K. Petersen" <[EMAIL PROTECTED]>
Cc: Jeff Garzik <[EMAIL PROTECTED]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
Cc: Alan Cox <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 drivers/ata/pata_cs5536.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/ata/pata_cs5536.c~pata_cs5536-mwdma-fix 
drivers/ata/pata_cs5536.c
--- a/drivers/ata/pata_cs5536.c~pata_cs5536-mwdma-fix
+++ a/drivers/ata/pata_cs5536.c
@@ -40,7 +40,7 @@
 #include <asm/msr.h>
 
 #define DRV_NAME       "pata_cs5536"
-#define DRV_VERSION    "0.0.5"
+#define DRV_VERSION    "0.0.6"
 
 enum {
        CFG                     = 0,
@@ -214,7 +214,7 @@ static void cs5536_set_dmamode(struct at
                cs5536_read(pdev, DTC, &dtc);
 
                dtc &= ~(IDE_DRV_MASK << dshift);
-               dtc |= mwdma_timings[mode] << dshift;
+               dtc |= mwdma_timings[mode - XFER_MW_DMA_0] << dshift;
 
                cs5536_write(pdev, DTC, dtc);
        }
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

origin.patch
pata_cs5536-mwdma-fix.patch
ide-arm-hack.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to