aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-cd.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-06-23 05:06:06 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-23 10:43:08 -0400
commit125e18745f16685f69a34fd6130d47598fc4bf54 (patch)
treec97ed94b0525a572efa1bd4990a55b18be5d781d /drivers/ide/ide-cd.c
parent78ce89c92bc6eaf5933b5664bff64253a7103bd7 (diff)
[PATCH] More BUG_ON conversion
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: James Bottomley <James.Bottomley@steeleye.com> Acked-by: "Salyzyn, Mark" <mark_salyzyn@adaptec.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r--drivers/ide/ide-cd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index abb83d95df57..6de3cd3d6e8e 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1725,8 +1725,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
1725 } 1725 }
1726 } 1726 }
1727 1727
1728 if (HWGROUP(drive)->handler != NULL) 1728 BUG_ON(HWGROUP(drive)->handler != NULL);
1729 BUG();
1730 1729
1731 ide_set_handler(drive, cdrom_newpc_intr, rq->timeout, NULL); 1730 ide_set_handler(drive, cdrom_newpc_intr, rq->timeout, NULL);
1732 return ide_started; 1731 return ide_started;