diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-25 19:02:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-25 19:02:06 -0800 |
commit | a8d0b6666ecfe14226f1e46d693d5e2cde072337 (patch) | |
tree | fc561f1e0d1489961782fb3c37466ce9c7f1951e /drivers/mtd/ubi/upd.c | |
parent | c799d15333ff52a3f19ca926636a7774a16cca58 (diff) | |
parent | ebddd63b74dcf1cb676d14328d5852f1fee19a8a (diff) |
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
* 'linux-next' of git://git.infradead.org/ubi-2.6:
UBI: fix memory leak in update path
UBI: add more checks to chdev open
UBI: initialise update marker
Diffstat (limited to 'drivers/mtd/ubi/upd.c')
-rw-r--r-- | drivers/mtd/ubi/upd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/ubi/upd.c b/drivers/mtd/ubi/upd.c index c1d7b880c79..425bf5a3edd 100644 --- 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); |