|
@@ -1011,10 +1011,7 @@ void ide_timer_expiry (unsigned long data)
|
|
} else {
|
|
} else {
|
|
ide_hwif_t *hwif;
|
|
ide_hwif_t *hwif;
|
|
ide_startstop_t startstop = ide_stopped;
|
|
ide_startstop_t startstop = ide_stopped;
|
|
- if (!hwgroup->busy) {
|
|
|
|
- hwgroup->busy = 1; /* paranoia */
|
|
|
|
- printk(KERN_ERR "%s: ide_timer_expiry: hwgroup->busy was 0 ??\n", drive->name);
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
if ((expiry = hwgroup->expiry) != NULL) {
|
|
if ((expiry = hwgroup->expiry) != NULL) {
|
|
/* continue */
|
|
/* continue */
|
|
if ((wait = expiry(drive)) > 0) {
|
|
if ((wait = expiry(drive)) > 0) {
|
|
@@ -1227,10 +1224,6 @@ irqreturn_t ide_intr (int irq, void *dev_id)
|
|
*/
|
|
*/
|
|
goto out;
|
|
goto out;
|
|
|
|
|
|
- if (!hwgroup->busy) {
|
|
|
|
- hwgroup->busy = 1; /* paranoia */
|
|
|
|
- printk(KERN_ERR "%s: ide_intr: hwgroup->busy was 0 ??\n", drive->name);
|
|
|
|
- }
|
|
|
|
hwgroup->handler = NULL;
|
|
hwgroup->handler = NULL;
|
|
hwgroup->req_gen++;
|
|
hwgroup->req_gen++;
|
|
del_timer(&hwgroup->timer);
|
|
del_timer(&hwgroup->timer);
|