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-lib.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-lib.c')
| -rw-r--r-- | drivers/ide/ide-lib.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c index 41d46dbe6c24..16a143133f93 100644 --- a/drivers/ide/ide-lib.c +++ b/drivers/ide/ide-lib.c | |||
| @@ -164,8 +164,7 @@ u8 ide_rate_filter (u8 mode, u8 speed) | |||
| 164 | // printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed); | 164 | // printk("%s: mode 0x%02x, speed 0x%02x\n", __FUNCTION__, mode, speed); |
| 165 | 165 | ||
| 166 | /* So that we remember to update this if new modes appear */ | 166 | /* So that we remember to update this if new modes appear */ |
| 167 | if (mode > 4) | 167 | BUG_ON(mode > 4); |
| 168 | BUG(); | ||
| 169 | return min(speed, speed_max[mode]); | 168 | return min(speed, speed_max[mode]); |
| 170 | #else /* !CONFIG_BLK_DEV_IDEDMA */ | 169 | #else /* !CONFIG_BLK_DEV_IDEDMA */ |
| 171 | return min(speed, (u8)XFER_PIO_4); | 170 | return min(speed, (u8)XFER_PIO_4); |