diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-06-23 05:06:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:43:08 -0400 |
commit | 125e18745f16685f69a34fd6130d47598fc4bf54 (patch) | |
tree | c97ed94b0525a572efa1bd4990a55b18be5d781d /drivers/ide/ide-taskfile.c | |
parent | 78ce89c92bc6eaf5933b5664bff64253a7103bd7 (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-taskfile.c')
-rw-r--r-- | drivers/ide/ide-taskfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 9233b8109a0f..a839b2a8f6f4 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -196,8 +196,7 @@ ide_startstop_t set_geometry_intr (ide_drive_t *drive) | |||
196 | if (stat & (ERR_STAT|DRQ_STAT)) | 196 | if (stat & (ERR_STAT|DRQ_STAT)) |
197 | return ide_error(drive, "set_geometry_intr", stat); | 197 | return ide_error(drive, "set_geometry_intr", stat); |
198 | 198 | ||
199 | if (HWGROUP(drive)->handler != NULL) | 199 | BUG_ON(HWGROUP(drive)->handler != NULL); |
200 | BUG(); | ||
201 | ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL); | 200 | ide_set_handler(drive, &set_geometry_intr, WAIT_WORSTCASE, NULL); |
202 | return ide_started; | 201 | return ide_started; |
203 | } | 202 | } |