Skip to content

Commit f323b80

Browse files
committed
ide: sanitize SELECT_MASK() usage in ide_driveid_update()
Call SELECT_MASK() after ide_fix_driveid(). Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
1 parent 1bd4c1f commit f323b80

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

drivers/ide/ide-iops.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,15 @@ int ide_driveid_update(ide_drive_t *drive)
340340
}
341341

342342
local_irq_save(flags);
343-
SELECT_MASK(drive, 0);
344343
tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
345344
(void)tp_ops->read_status(hwif); /* clear drive IRQ */
346345
local_irq_enable();
347346
local_irq_restore(flags);
347+
348348
ide_fix_driveid(id);
349349

350+
SELECT_MASK(drive, 0);
351+
350352
drive->id[ATA_ID_UDMA_MODES] = id[ATA_ID_UDMA_MODES];
351353
drive->id[ATA_ID_MWDMA_MODES] = id[ATA_ID_MWDMA_MODES];
352354
drive->id[ATA_ID_SWDMA_MODES] = id[ATA_ID_SWDMA_MODES];

0 commit comments

Comments
 (0)