diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-05 20:57:50 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-05 20:57:50 -0500 |
commit | f2694b7e3bad75436b47b6840de352f7b7f53feb (patch) | |
tree | 1fa8865fec93cea2eacfa0775d01410927407de8 | |
parent | afdd360c95632b0c882790a7b25ff505664adcd0 (diff) |
ide: remove redundant BUG_ON() from [atapi_]reset_pollfunc()
Same BUG_ON() is present inside ide_set_handler().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r-- | drivers/ide/ide-iops.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index a95178f5e1bb..7647ac4cdef8 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) | |||
860 | printk("%s: ATAPI reset complete\n", drive->name); | 860 | printk("%s: ATAPI reset complete\n", drive->name); |
861 | } else { | 861 | } else { |
862 | if (time_before(jiffies, hwgroup->poll_timeout)) { | 862 | if (time_before(jiffies, hwgroup->poll_timeout)) { |
863 | BUG_ON(HWGROUP(drive)->handler != NULL); | ||
864 | ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); | 863 | ide_set_handler(drive, &atapi_reset_pollfunc, HZ/20, NULL); |
865 | /* continue polling */ | 864 | /* continue polling */ |
866 | return ide_started; | 865 | return ide_started; |
@@ -900,7 +899,6 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive) | |||
900 | 899 | ||
901 | if (!OK_STAT(tmp = hwif->INB(IDE_STATUS_REG), 0, BUSY_STAT)) { | 900 | if (!OK_STAT(tmp = hwif->INB(IDE_STATUS_REG), 0, BUSY_STAT)) { |
902 | if (time_before(jiffies, hwgroup->poll_timeout)) { | 901 | if (time_before(jiffies, hwgroup->poll_timeout)) { |
903 | BUG_ON(HWGROUP(drive)->handler != NULL); | ||
904 | ide_set_handler(drive, &reset_pollfunc, HZ/20, NULL); | 902 | ide_set_handler(drive, &reset_pollfunc, HZ/20, NULL); |
905 | /* continue polling */ | 903 | /* continue polling */ |
906 | return ide_started; | 904 | return ide_started; |