diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 12:41:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 12:41:18 -0500 |
commit | 9ae21d1bb376436285cd5346d3e4b3655d6dd1b9 (patch) | |
tree | 8f889770fae721da63bd378c1834a87e2eb1cfb5 /drivers/char | |
parent | f9b4192923fa6e38331e88214b1fe5fc21583fcc (diff) | |
parent | e9415777b1cd0eaf4d1d3d61772f0e6d5c2551ad (diff) |
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/
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/epca.c | 3 | ||||
-rw-r--r-- | drivers/char/ftape/lowlevel/fdc-io.c | 2 | ||||
-rw-r--r-- | drivers/char/tty_io.c | 11 |
3 files changed, 6 insertions, 10 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index 765c5c108bf4..9cad8501d62c 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
@@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp) | |||
486 | } /* End channel is open more than once */ | 486 | } /* End channel is open more than once */ |
487 | 487 | ||
488 | /* Port open only once go ahead with shutdown & reset */ | 488 | /* Port open only once go ahead with shutdown & reset */ |
489 | if (ch->count < 0) | 489 | BUG_ON(ch->count < 0); |
490 | BUG(); | ||
491 | 490 | ||
492 | /* --------------------------------------------------------------- | 491 | /* --------------------------------------------------------------- |
493 | Let the rest of the driver know the channel is being closed. | 492 | Let the rest of the driver know the channel is being closed. |
diff --git a/drivers/char/ftape/lowlevel/fdc-io.c b/drivers/char/ftape/lowlevel/fdc-io.c index b2e0928e8428..093fdf98b19a 100644 --- a/drivers/char/ftape/lowlevel/fdc-io.c +++ b/drivers/char/ftape/lowlevel/fdc-io.c | |||
@@ -607,7 +607,7 @@ void fdc_reset(void) | |||
607 | 607 | ||
608 | fdc_mode = fdc_idle; | 608 | fdc_mode = fdc_idle; |
609 | 609 | ||
610 | /* maybe the cli()/sti() pair is not necessary, BUT: | 610 | /* maybe the spin_lock_irq* pair is not necessary, BUT: |
611 | * the following line MUST be here. Otherwise fdc_interrupt_wait() | 611 | * the following line MUST be here. Otherwise fdc_interrupt_wait() |
612 | * won't wait. Note that fdc_reset() is called from | 612 | * won't wait. Note that fdc_reset() is called from |
613 | * ftape_dumb_stop() when the fdc is busy transferring data. In this | 613 | * ftape_dumb_stop() when the fdc is busy transferring data. In this |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 48d795bb8c4b..811dadb9ce3e 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
@@ -543,14 +543,12 @@ void tty_ldisc_put(int disc) | |||
543 | struct tty_ldisc *ld; | 543 | struct tty_ldisc *ld; |
544 | unsigned long flags; | 544 | unsigned long flags; |
545 | 545 | ||
546 | if (disc < N_TTY || disc >= NR_LDISCS) | 546 | BUG_ON(disc < N_TTY || disc >= NR_LDISCS); |
547 | BUG(); | ||
548 | 547 | ||
549 | spin_lock_irqsave(&tty_ldisc_lock, flags); | 548 | spin_lock_irqsave(&tty_ldisc_lock, flags); |
550 | ld = &tty_ldiscs[disc]; | 549 | ld = &tty_ldiscs[disc]; |
551 | if(ld->refcount == 0) | 550 | BUG_ON(ld->refcount == 0); |
552 | BUG(); | 551 | ld->refcount--; |
553 | ld->refcount --; | ||
554 | module_put(ld->owner); | 552 | module_put(ld->owner); |
555 | spin_unlock_irqrestore(&tty_ldisc_lock, flags); | 553 | spin_unlock_irqrestore(&tty_ldisc_lock, flags); |
556 | } | 554 | } |
@@ -645,8 +643,7 @@ void tty_ldisc_deref(struct tty_ldisc *ld) | |||
645 | { | 643 | { |
646 | unsigned long flags; | 644 | unsigned long flags; |
647 | 645 | ||
648 | if(ld == NULL) | 646 | BUG_ON(ld == NULL); |
649 | BUG(); | ||
650 | 647 | ||
651 | spin_lock_irqsave(&tty_ldisc_lock, flags); | 648 | spin_lock_irqsave(&tty_ldisc_lock, flags); |
652 | if(ld->refcount == 0) | 649 | if(ld->refcount == 0) |