diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
| commit | a8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch) | |
| tree | 980fb6b019e11e6cb1ece55b7faff184721a8053 /drivers/mtd/devices | |
| parent | 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/devices')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 25efd331ef28..b402269301f6 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -346,8 +346,10 @@ static int m25p80_write(struct mtd_info *mtd, loff_t to, size_t len, | |||
| 346 | mutex_lock(&flash->lock); | 346 | mutex_lock(&flash->lock); |
| 347 | 347 | ||
| 348 | /* Wait until finished previous write command. */ | 348 | /* Wait until finished previous write command. */ |
| 349 | if (wait_till_ready(flash)) | 349 | if (wait_till_ready(flash)) { |
| 350 | mutex_unlock(&flash->lock); | ||
| 350 | return 1; | 351 | return 1; |
| 352 | } | ||
| 351 | 353 | ||
| 352 | write_enable(flash); | 354 | write_enable(flash); |
| 353 | 355 | ||