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
This commit is contained in:
commit
c8d10bffdb
|
@ -346,8 +346,10 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len,
|
||||||
mutex_lock(&flash->lock);
|
mutex_lock(&flash->lock);
|
||||||
|
|
||||||
/* Wait until finished previous write command. */
|
/* Wait until finished previous write command. */
|
||||||
if (wait_till_ready(flash))
|
if (wait_till_ready(flash)) {
|
||||||
|
mutex_unlock(&flash->lock);
|
||||||
return 1;
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
write_enable(flash);
|
write_enable(flash);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue