From: Bartlomiej Zolnierkiewicz Date: Tue, 24 Mar 2009 22:22:58 +0000 (+0100) Subject: ide: clear drive IRQ after re-enabling local IRQs in ide_driveid_update() X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ff18b89bef76d291db594af3e27b6c91e6600b57;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index f92c63f564d..affbc603987 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c @@ -341,10 +341,10 @@ int ide_driveid_update(ide_drive_t *drive) 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);