Skip to content

Commit

Permalink
ide: sanitize SELECT_MASK() usage in ide_driveid_update()
Browse files Browse the repository at this point in the history
Call SELECT_MASK() after ide_fix_driveid().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Mar 24, 2009
1 parent 1bd4c1f commit f323b80
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/ide/ide-iops.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,15 @@ int ide_driveid_update(ide_drive_t *drive)
}

local_irq_save(flags);
SELECT_MASK(drive, 0);
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);

ide_fix_driveid(id);

SELECT_MASK(drive, 0);

drive->id[ATA_ID_UDMA_MODES] = id[ATA_ID_UDMA_MODES];
drive->id[ATA_ID_MWDMA_MODES] = id[ATA_ID_MWDMA_MODES];
drive->id[ATA_ID_SWDMA_MODES] = id[ATA_ID_SWDMA_MODES];
Expand Down

0 comments on commit f323b80

Please sign in to comment.