diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 15:57:26 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-02 15:57:26 -0800 |
commit | 574c3fdae3890e60f8bc59e8107686944ba1e446 (patch) | |
tree | 7c41ea5bff8ef69b0ba600b74980e590e3be17dd /drivers/mtd/ubi/debug.h | |
parent | 56635f7e6197404d7363f8dcaa7a97abf57276fb (diff) | |
parent | f2863c54f30cccb50661697a6e4bdcd0ad0b0a6c (diff) |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
* 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6:
UBI: fix checkpatch.pl warnings
UBI: simplify PEB protection code
UBI: prepare for protection tree improvements
UBI: return -ENOMEM upon failing vmalloc
UBI: document UBI ioctls
UBI: handle write errors in WL worker
UBI: fix error path
UBI: some code re-structuring
UBI: fix deadlock
UBI: fix warnings when debugging is enabled
Diffstat (limited to 'drivers/mtd/ubi/debug.h')
-rw-r--r-- | drivers/mtd/ubi/debug.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h index 78e914d23ec..13777e5beac 100644 --- a/drivers/mtd/ubi/debug.h +++ b/drivers/mtd/ubi/debug.h @@ -27,11 +27,11 @@ #define dbg_err(fmt, ...) ubi_err(fmt, ##__VA_ARGS__) #define ubi_assert(expr) do { \ - if (unlikely(!(expr))) { \ - printk(KERN_CRIT "UBI assert failed in %s at %u (pid %d)\n", \ - __func__, __LINE__, current->pid); \ - ubi_dbg_dump_stack(); \ - } \ + if (unlikely(!(expr))) { \ + printk(KERN_CRIT "UBI assert failed in %s at %u (pid %d)\n", \ + __func__, __LINE__, current->pid); \ + ubi_dbg_dump_stack(); \ + } \ } while (0) #define dbg_msg(fmt, ...) \ |