Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 21025
b: refs/heads/master
c: 3cb4f09
h: refs/heads/master
i:
  21023: 700faf2
v: v3
  • Loading branch information
David Brownell authored and Linus Torvalds committed Mar 14, 2006
1 parent 5bc62a4 commit 1e3c611
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 3759fa9c55923f719ae944a3f8fbb029b36f759d
refs/heads/master: 3cb4f09fc2e98bbf26f8c900a94bf3910cd4d823
2 changes: 1 addition & 1 deletion trunk/drivers/mtd/devices/mtd_dataflash.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int dataflash_erase(struct mtd_info *mtd, struct erase_info *instr)
* we're at a block boundary and need to erase the whole block.
*/
pageaddr = instr->addr / priv->page_size;
do_block = (pageaddr & 0x7) == 0 && instr->len <= blocksize;
do_block = (pageaddr & 0x7) == 0 && instr->len >= blocksize;
pageaddr = pageaddr << priv->page_offset;

command[0] = do_block ? OP_ERASE_BLOCK : OP_ERASE_PAGE;
Expand Down

0 comments on commit 1e3c611

Please sign in to comment.