Skip to content

Commit ff18b89

Browse files
committed
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>
1 parent f323b80 commit ff18b89

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/ide/ide-iops.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,10 +341,10 @@ int ide_driveid_update(ide_drive_t *drive)
341341

342342
local_irq_save(flags);
343343
tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
344-
(void)tp_ops->read_status(hwif); /* clear drive IRQ */
345-
local_irq_enable();
346344
local_irq_restore(flags);
347345

346+
(void)tp_ops->read_status(hwif); /* clear drive IRQ */
347+
348348
ide_fix_driveid(id);
349349

350350
SELECT_MASK(drive, 0);

0 commit comments

Comments
 (0)