summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 23:22:58 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 23:22:58 +0100
commitff18b89bef76d291db594af3e27b6c91e6600b57 (patch)
tree1ede81393444c94ff7e0dd3da4987a3936d1a131 /drivers/ide/ide-iops.c
parentf323b80dceaca858f8e240ca098681fcfe7fd3c4 (diff)
downloadop-kernel-dev-ff18b89bef76d291db594af3e27b6c91e6600b57.zip
op-kernel-dev-ff18b89bef76d291db594af3e27b6c91e6600b57.tar.gz
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>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index f92c63f..affbc60 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);
OpenPOWER on IntegriCloud