]> err.no Git - linux-2.6/commitdiff
[MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles
authorDavid Woodhouse <dwmw2@infradead.org>
Fri, 9 Jun 2006 23:53:16 +0000 (00:53 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Fri, 9 Jun 2006 23:53:16 +0000 (00:53 +0100)
Fix the control bit handling so it even looks like it might work, too.
Bad tglx. No biscuit.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
drivers/mtd/nand/s3c2410.c

index 8429793a628828af72821f1315bbe28441e3c1f3..d6365a668874f5c040d0db44f532aa357832d89c 100644 (file)
@@ -256,7 +256,7 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip)
 */
 
 static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
-                                  unsigend int ctrl)
+                                  unsigned int ctrl)
 {
        struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
        struct nand_chip *chip = mtd->priv;
@@ -264,7 +264,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
        if (cmd == NAND_CMD_NONE)
                return;
 
-       if (cmd & NAND_CLE)
+       if (ctrl & NAND_CLE)
                writeb(cmd, info->regs + S3C2410_NFCMD);
        else
                writeb(cmd, info->regs + S3C2410_NFADDR);
@@ -272,8 +272,8 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
 
 /* command and control functions */
 
-static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
-                                  unsigend int ctrl)
+static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd,
+                                  unsigned int ctrl)
 {
        struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
        struct nand_chip *chip = mtd->priv;
@@ -281,7 +281,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
        if (cmd == NAND_CMD_NONE)
                return;
 
-       if (cmd & NAND_CLE)
+       if (ctrl & NAND_CLE)
                writeb(cmd, info->regs + S3C2440_NFCMD);
        else
                writeb(cmd, info->regs + S3C2440_NFADDR);