mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (21 commits) BUG_ON() Conversion in drivers/video/ BUG_ON() Conversion in drivers/parisc/ BUG_ON() Conversion in drivers/block/ BUG_ON() Conversion in sound/sparc/cs4231.c BUG_ON() Conversion in drivers/s390/block/dasd.c BUG_ON() Conversion in lib/swiotlb.c BUG_ON() Conversion in kernel/cpu.c BUG_ON() Conversion in ipc/msg.c BUG_ON() Conversion in block/elevator.c BUG_ON() Conversion in fs/coda/ BUG_ON() Conversion in fs/binfmt_elf_fdpic.c BUG_ON() Conversion in input/serio/hil_mlc.c BUG_ON() Conversion in md/dm-hw-handler.c BUG_ON() Conversion in md/bitmap.c The comment describing how MS_ASYNC works in msync.c is confusing rcu: undeclared variable used in documentation fix typos "wich" -> "which" typo patch for fs/ufs/super.c Fix simple typos tabify drivers/char/Makefile ...
This commit is contained in:
commit
1e8c573933
39 changed files with 116 additions and 142 deletions
|
|
@ -1309,7 +1309,7 @@ int bitmap_startwrite(struct bitmap *bitmap, sector_t offset, unsigned long sect
|
|||
case 1:
|
||||
*bmc = 2;
|
||||
}
|
||||
if ((*bmc & COUNTER_MAX) == COUNTER_MAX) BUG();
|
||||
BUG_ON((*bmc & COUNTER_MAX) == COUNTER_MAX);
|
||||
(*bmc)++;
|
||||
|
||||
spin_unlock_irq(&bitmap->lock);
|
||||
|
|
|
|||
|
|
@ -83,8 +83,7 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
|
|||
if (--hwhi->use == 0)
|
||||
module_put(hwhi->hwht.module);
|
||||
|
||||
if (hwhi->use < 0)
|
||||
BUG();
|
||||
BUG_ON(hwhi->use < 0);
|
||||
|
||||
out:
|
||||
up_read(&_hwh_lock);
|
||||
|
|
|
|||
Loading…
Reference in a new issue