[PATCH 7/8] ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update()

Bartlomiej Zolnierkiewicz
2009-01-22T14:20:30Z

Subject: [PATCH] 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>
---
drivers/ide/ide-iops.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: b/drivers/ide/ide-iops.c
===================================================================
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -341,10 +341,10 @@ int ide_driveid_update(ide_drive_t *driv

local_irq_save(flags);
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);

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

SELECT_MASK(drive, 0);