Browse Source

ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update()

Clear drive IRQ after re-enabling local IRQs in ide_driveid_update()
to match try_to_identify().

Also remove superfluous local_irq_enable() call while at it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Bartlomiej Zolnierkiewicz 16 years ago
parent
commit
ff18b89bef
1 changed files with 2 additions and 2 deletions
  1. 2 2
      drivers/ide/ide-iops.c

+ 2 - 2
drivers/ide/ide-iops.c

@@ -341,10 +341,10 @@ int ide_driveid_update(ide_drive_t *drive)
 
 
 	local_irq_save(flags);
 	local_irq_save(flags);
 	tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
 	tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
-	(void)tp_ops->read_status(hwif);	/* clear drive IRQ */
-	local_irq_enable();
 	local_irq_restore(flags);
 	local_irq_restore(flags);
 
 
+	(void)tp_ops->read_status(hwif); /* clear drive IRQ */
+
 	ide_fix_driveid(id);
 	ide_fix_driveid(id);
 
 
 	SELECT_MASK(drive, 0);
 	SELECT_MASK(drive, 0);