Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ae21d1b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  drivers/char/ftape/lowlevel/fdc-io.c: Correct a comment
  Kconfig help: MTD_JEDECPROBE already supports Intel
  Remove ugly debugging stuff
  do_mounts.c: Minor ROOT_DEV comment cleanup
  BUG_ON() Conversion in drivers/s390/block/dasd_devmap.c
  BUG_ON() Conversion in mm/mempool.c
  BUG_ON() Conversion in mm/memory.c
  BUG_ON() Conversion in kernel/fork.c
  BUG_ON() Conversion in ipc/sem.c
  BUG_ON() Conversion in fs/ext2/
  BUG_ON() Conversion in fs/hfs/
  BUG_ON() Conversion in fs/dcache.c
  BUG_ON() Conversion in fs/buffer.c
  BUG_ON() Conversion in input/serio/hp_sdc_mlc.c
  BUG_ON() Conversion in md/dm-table.c
  BUG_ON() Conversion in md/dm-path-selector.c
  BUG_ON() Conversion in drivers/isdn
  BUG_ON() Conversion in drivers/char
  BUG_ON() Conversion in drivers/mtd/
parents f9b41929 e9415777

drivers/char/epca.c

+1 −2
Original line number Diff line number Diff line
@@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp) 
		} /* End channel is open more than once */



		/* Port open only once go ahead with shutdown & reset */

		if (ch->count < 0)

			BUG();

		BUG_ON(ch->count < 0);



		/* ---------------------------------------------------------------

			Let the rest of the driver know the channel is being closed.

drivers/char/ftape/lowlevel/fdc-io.c

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ void fdc_reset(void) 


	fdc_mode = fdc_idle;



	/*  maybe the cli()/sti() pair is not necessary, BUT:

	/*  maybe the spin_lock_irq* pair is not necessary, BUT:

	 *  the following line MUST be here. Otherwise fdc_interrupt_wait()

	 *  won't wait. Note that fdc_reset() is called from 

	 *  ftape_dumb_stop() when the fdc is busy transferring data. In this

drivers/char/tty_io.c

+4 −7
Original line number Diff line number Diff line
@@ -543,13 +543,11 @@ void tty_ldisc_put(int disc) 
	struct tty_ldisc *ld;

	unsigned long flags;

	

	if (disc < N_TTY || disc >= NR_LDISCS)

		BUG();

	BUG_ON(disc < N_TTY || disc >= NR_LDISCS);

		

	spin_lock_irqsave(&tty_ldisc_lock, flags);

	ld = &tty_ldiscs[disc];

	if(ld->refcount == 0)

		BUG();

	BUG_ON(ld->refcount == 0);

	ld->refcount--;

	module_put(ld->owner);

	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
@@ -645,8 +643,7 @@ void tty_ldisc_deref(struct tty_ldisc *ld) 
{

	unsigned long flags;



	if(ld == NULL)

		BUG();

	BUG_ON(ld == NULL);

		

	spin_lock_irqsave(&tty_ldisc_lock, flags);

	if(ld->refcount == 0)

drivers/input/serio/hp_sdc_mlc.c

+4 −3
Original line number Diff line number Diff line
@@ -270,9 +270,10 @@ static void hp_sdc_mlc_out (hil_mlc *mlc) { 


 do_control:

	priv->emtestmode = mlc->opacket & HIL_CTRL_TEST;

	if ((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE) {

		BUG(); /* we cannot emulate this, it should not be used. */

	}

	

	/* we cannot emulate this, it should not be used. */

	BUG_ON((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE);

	

	if ((mlc->opacket & HIL_CTRL_ONLY) == HIL_CTRL_ONLY) goto control_only;

	if (mlc->opacket & HIL_CTRL_APE) { 

		BUG(); /* Should not send command/data after engaging APE */

drivers/isdn/hisax/hisax_fcpcipnp.c

+2 −5
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ static void hdlc_fill_fifo(struct fritz_bcs *bcs) 


	DBG(0x40, "hdlc_fill_fifo");



	if (skb->len == 0)

		BUG();

	BUG_ON(skb->len == 0);



	bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME;

	if (bcs->tx_skb->len > bcs->fifo_size) {
@@ -630,9 +629,7 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg) 


	switch (pr) {

	case PH_DATA | REQUEST:

		if (bcs->tx_skb)

			BUG();

		

		BUG_ON(bcs->tx_skb);

		bcs->tx_skb = skb;

		DBG_SKB(1, skb);

		hdlc_fill_fifo(bcs);