Commit c8d10bff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dwmw2/mtd-2.6.26 

* git://git.infradead.org/~dwmw2/mtd-2.6.26:
  [MTD] m25p80.c mutex unlock fix
parents eb4e545d bc018863

drivers/mtd/devices/m25p80.c

+3 −1
Original line number Diff line number Diff line
@@ -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);