Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30943
b: refs/heads/master
c: 6a93096
h: refs/heads/master
i:
  30941: ad744dd
  30939: c7ed178
  30935: f746319
  30927: 1118c25
  30911: 35b02d7
v: v3
  • Loading branch information
Thomas Gleixner authored and David Woodhouse committed Jun 27, 2006
1 parent a6c70cc commit 04a87d7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 1887f517e3cdf5f1e9c0e4daaa864450415a8f61
refs/heads/master: 6a93096195305f6f2a39544a034e77e2e74d5799
6 changes: 3 additions & 3 deletions trunk/drivers/mtd/nand/nand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1610,13 +1610,13 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
if (!writelen)
return 0;

chipnr = (int)(to >> chip->chip_shift);
chip->select_chip(mtd, chipnr);

/* Check, if it is write protected */
if (nand_check_wp(mtd))
return -EIO;

chipnr = (int)(to >> chip->chip_shift);
chip->select_chip(mtd, chipnr);

realpage = (int)(to >> chip->page_shift);
page = realpage & chip->pagemask;
blockmask = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;
Expand Down

0 comments on commit 04a87d7

Please sign in to comment.