diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/ide-io.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 40327d1e6a9f..c60512196f61 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -1011,10 +1011,7 @@ void ide_timer_expiry (unsigned long data) | |||
1011 | } else { | 1011 | } else { |
1012 | ide_hwif_t *hwif; | 1012 | ide_hwif_t *hwif; |
1013 | ide_startstop_t startstop = ide_stopped; | 1013 | ide_startstop_t startstop = ide_stopped; |
1014 | if (!hwgroup->busy) { | 1014 | |
1015 | hwgroup->busy = 1; /* paranoia */ | ||
1016 | printk(KERN_ERR "%s: ide_timer_expiry: hwgroup->busy was 0 ??\n", drive->name); | ||
1017 | } | ||
1018 | if ((expiry = hwgroup->expiry) != NULL) { | 1015 | if ((expiry = hwgroup->expiry) != NULL) { |
1019 | /* continue */ | 1016 | /* continue */ |
1020 | if ((wait = expiry(drive)) > 0) { | 1017 | if ((wait = expiry(drive)) > 0) { |
@@ -1227,10 +1224,6 @@ irqreturn_t ide_intr (int irq, void *dev_id) | |||
1227 | */ | 1224 | */ |
1228 | goto out; | 1225 | goto out; |
1229 | 1226 | ||
1230 | if (!hwgroup->busy) { | ||
1231 | hwgroup->busy = 1; /* paranoia */ | ||
1232 | printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name); | ||
1233 | } | ||
1234 | hwgroup->handler = NULL; | 1227 | hwgroup->handler = NULL; |
1235 | hwgroup->req_gen++; | 1228 | hwgroup->req_gen++; |
1236 | del_timer(&hwgroup->timer); | 1229 | del_timer(&hwgroup->timer); |