git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[sfrench/cifs-2.6.git]
/
drivers
/
mtd
/
ubi
/
upd.c
diff --git
a/drivers/mtd/ubi/upd.c
b/drivers/mtd/ubi/upd.c
index c1d7b880c7953969a282969637b69f052a8454ed..425bf5a3edd4778b0dc2e3bcc6a47f0f5e1cca18 100644
(file)
--- a/
drivers/mtd/ubi/upd.c
+++ b/
drivers/mtd/ubi/upd.c
@@
-155,6
+155,7
@@
int ubi_start_update(struct ubi_device *ubi, struct ubi_volume *vol,
if (err)
return err;
vol->updating = 0;
+ return 0;
}
vol->upd_buf = vmalloc(ubi->leb_size);