diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-06-09 19:53:16 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-09 19:53:16 -0400 |
| commit | f9068876f5ef583f8e9ebf4acd2ef5b35b113db9 (patch) | |
| tree | 9347def6b7859dfa6c08e54640ee0f6c94f1ede3 | |
| parent | f24ff6bf8c903bc0c645bf87fbe87f9a6d9f634f (diff) | |
[MTD NAND] Fix s3c2410 NAND driver so it at least _looks_ like it compiles
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>
| -rw-r--r-- | drivers/mtd/nand/s3c2410.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 8429793a6288..d6365a668874 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c | |||
| @@ -256,7 +256,7 @@ static void s3c2410_nand_select_chip(struct mtd_info *mtd, int chip) | |||
| 256 | */ | 256 | */ |
| 257 | 257 | ||
| 258 | static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd, | 258 | static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd, |
| 259 | unsigend int ctrl) | 259 | unsigned int ctrl) |
| 260 | { | 260 | { |
| 261 | struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); | 261 | struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); |
| 262 | struct nand_chip *chip = mtd->priv; | 262 | struct nand_chip *chip = mtd->priv; |
| @@ -264,7 +264,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd, | |||
| 264 | if (cmd == NAND_CMD_NONE) | 264 | if (cmd == NAND_CMD_NONE) |
| 265 | return; | 265 | return; |
| 266 | 266 | ||
| 267 | if (cmd & NAND_CLE) | 267 | if (ctrl & NAND_CLE) |
| 268 | writeb(cmd, info->regs + S3C2410_NFCMD); | 268 | writeb(cmd, info->regs + S3C2410_NFCMD); |
| 269 | else | 269 | else |
| 270 | writeb(cmd, info->regs + S3C2410_NFADDR); | 270 | writeb(cmd, info->regs + S3C2410_NFADDR); |
| @@ -272,8 +272,8 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd, | |||
| 272 | 272 | ||
| 273 | /* command and control functions */ | 273 | /* command and control functions */ |
| 274 | 274 | ||
| 275 | static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd, | 275 | static void s3c2440_nand_hwcontrol(struct mtd_info *mtd, int cmd, |
| 276 | unsigend int ctrl) | 276 | unsigned int ctrl) |
| 277 | { | 277 | { |
| 278 | struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); | 278 | struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd); |
| 279 | struct nand_chip *chip = mtd->priv; | 279 | struct nand_chip *chip = mtd->priv; |
| @@ -281,7 +281,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd, | |||
| 281 | if (cmd == NAND_CMD_NONE) | 281 | if (cmd == NAND_CMD_NONE) |
| 282 | return; | 282 | return; |
| 283 | 283 | ||
| 284 | if (cmd & NAND_CLE) | 284 | if (ctrl & NAND_CLE) |
| 285 | writeb(cmd, info->regs + S3C2440_NFCMD); | 285 | writeb(cmd, info->regs + S3C2440_NFCMD); |
| 286 | else | 286 | else |
| 287 | writeb(cmd, info->regs + S3C2440_NFADDR); | 287 | writeb(cmd, info->regs + S3C2440_NFADDR); |
