mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -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
|
|
@ -228,8 +228,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len,
|
|||
void *cpu_end = loaf->cpu_free + len;
|
||||
void *cpu_addr = loaf->cpu_free;
|
||||
|
||||
if (cpu_end > loaf->cpu_base + loaf->length)
|
||||
BUG();
|
||||
BUG_ON(cpu_end > loaf->cpu_base + loaf->length);
|
||||
*dma_handle = loaf->dma_free;
|
||||
loaf->cpu_free = cpu_end;
|
||||
loaf->dma_free += len;
|
||||
|
|
|
|||
|
|
@ -2361,8 +2361,7 @@ queue:
|
|||
if (!creq)
|
||||
goto startio;
|
||||
|
||||
if (creq->nr_phys_segments > MAXSGENTRIES)
|
||||
BUG();
|
||||
BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);
|
||||
|
||||
if (( c = cmd_alloc(h, 1)) == NULL)
|
||||
goto full;
|
||||
|
|
|
|||
|
|
@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd
|
|||
|
||||
cp->Request.Timeout = 0;
|
||||
memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB));
|
||||
if (cmd->cmd_len > sizeof(cp->Request.CDB)) BUG();
|
||||
BUG_ON(cmd->cmd_len > sizeof(cp->Request.CDB));
|
||||
cp->Request.CDBLen = cmd->cmd_len;
|
||||
memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len);
|
||||
cp->Request.Type.Type = TYPE_CMD;
|
||||
|
|
|
|||
|
|
@ -906,8 +906,7 @@ queue_next:
|
|||
if (!creq)
|
||||
goto startio;
|
||||
|
||||
if (creq->nr_phys_segments > SG_MAX)
|
||||
BUG();
|
||||
BUG_ON(creq->nr_phys_segments > SG_MAX);
|
||||
|
||||
if ((c = cmd_alloc(h,1)) == NULL)
|
||||
goto startio;
|
||||
|
|
|
|||
Loading…
Reference in a new issue