Skip to content

Commit

Permalink
Merge git://git.infradead.org/~dwmw2/mtd-2.6.26
Browse files Browse the repository at this point in the history
* git://git.infradead.org/~dwmw2/mtd-2.6.26:
  [MTD] m25p80.c mutex unlock fix
  • Loading branch information
Linus Torvalds committed Jun 6, 2008
2 parents eb4e545 + bc01886 commit c8d10bf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/mtd/devices/m25p80.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,10 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
mutex_lock(&flash->lock);

/* Wait until finished previous write command. */
if (wait_till_ready(flash))
if (wait_till_ready(flash)) {
mutex_unlock(&flash->lock);
return 1;
}

write_enable(flash);

Expand Down

0 comments on commit c8d10bf

Please sign in to comment.