Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 27930
b: refs/heads/master
c: 7bc3312
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner authored and David Woodhouse committed Jun 20, 2006
1 parent cd97241 commit 0f3f497
Show file tree
Hide file tree
Showing 5 changed files with 232 additions and 89 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7e4178f90eec862affc97469118d5008bd1b5bda
refs/heads/master: 7bc3312bef4d6f220812500c0de7868fb7625a41
8 changes: 4 additions & 4 deletions trunk/drivers/mtd/mtdchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -504,12 +504,12 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
return ret;

ops.len = buf.length;
ops.ooblen = mtd->oobsize;
ops.ooblen = buf.length;
ops.ooboffs = buf.start & (mtd->oobsize - 1);
ops.datbuf = NULL;
ops.mode = MTD_OOB_PLACE;

if (ops.ooboffs && ops.len > (ops.ooblen - ops.ooboffs))
if (ops.ooboffs && ops.len > (mtd->oobsize - ops.ooboffs))
return -EINVAL;

ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
Expand Down Expand Up @@ -553,12 +553,12 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
return ret;

ops.len = buf.length;
ops.ooblen = mtd->oobsize;
ops.ooblen = buf.length;
ops.ooboffs = buf.start & (mtd->oobsize - 1);
ops.datbuf = NULL;
ops.mode = MTD_OOB_PLACE;

if (ops.ooboffs && ops.len > (ops.ooblen - ops.ooboffs))
if (ops.ooboffs && ops.len > (mtd->oobsize - ops.ooboffs))
return -EINVAL;

ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/nand/diskonchip.c
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ static void __init doc2000_count_chips(struct mtd_info *mtd)
printk(KERN_DEBUG "Detected %d chips per floor.\n", i);
}

static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this, int state)
static int doc200x_wait(struct mtd_info *mtd, struct nand_chip *this)
{
struct doc_priv *doc = this->priv;

Expand Down
Loading

0 comments on commit 0f3f497

Please sign in to comment.