From: Bartlomiej Zolnierkiewicz Date: Wed, 6 Feb 2008 01:57:50 +0000 (+0100) Subject: ide: remove redundant BUG_ON() from [atapi_]reset_pollfunc() X-Git-Tag: v2.6.25-rc1~779^2~21 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f2694b7e3bad75436b47b6840de352f7b7f53feb;p=linux-2.6-omap-h63xx.git ide: remove redundant BUG_ON() from [atapi_]reset_pollfunc() Same BUG_ON() is present inside ide_set_handler(). Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index a95178f5e1b..7647ac4cdef 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -860,7 +860,6 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive) printk("%s: ATAPI reset complete\n", drive->name); } else { if (time_before(jiffies, hwgroup->poll_timeout)) { - BUG_ON(HWGROUP(drive)->handler != NULL); ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); /* continue polling */ return ide_started; @@ -900,7 +899,6 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive) if (!OK_STAT(tmp = hwif->INB(IDE_STATUS_REG), 0, BUSY_STAT)) { if (time_before(jiffies, hwgroup->poll_timeout)) { - BUG_ON(HWGROUP(drive)->handler != NULL); ide_set_handler(drive, &reset_pollfunc, HZ/20, NULL); /* continue polling */ return ide_started;