diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-26 19:55:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-26 19:55:16 -0800 |
| commit | 3bef22eed98b53cfb3962884f14068251a5dd3f0 (patch) | |
| tree | 7602b9239d5aa301cf8fcb37affafe86cb2bb832 /drivers/mtd/ubi/debug.c | |
| parent | e2b0a1613200a044b0e5e3a78d157ab746a7a4fa (diff) | |
| parent | 6b238de189f69dc77d660d4cce62eed15547f4c3 (diff) | |
| download | lwn-3bef22eed98b53cfb3962884f14068251a5dd3f0.tar.gz lwn-3bef22eed98b53cfb3962884f14068251a5dd3f0.zip | |
Merge tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs
Pull UBI bug fixes from Richard Weinberger:
"This contains four bug fixes for UBI"
* tag 'upstream-4.4-rc7' of git://git.infradead.org/linux-ubifs:
mtd: ubi: don't leak e if schedule_erase() fails
mtd: ubi: fixup error correction in do_sync_erase()
UBI: fix use of "VID" vs. "EC" in header self-check
UBI: fix return error code
Diffstat (limited to 'drivers/mtd/ubi/debug.c')
| -rw-r--r-- | drivers/mtd/ubi/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c index b077e43b5ba9..c4cb15a3098c 100644 --- a/drivers/mtd/ubi/debug.c +++ b/drivers/mtd/ubi/debug.c @@ -236,7 +236,7 @@ int ubi_debugfs_init(void) dfs_rootdir = debugfs_create_dir("ubi", NULL); if (IS_ERR_OR_NULL(dfs_rootdir)) { - int err = dfs_rootdir ? -ENODEV : PTR_ERR(dfs_rootdir); + int err = dfs_rootdir ? PTR_ERR(dfs_rootdir) : -ENODEV; pr_err("UBI error: cannot create \"ubi\" debugfs directory, error %d\n", err); |