ide: sanitize SELECT_MASK() usage in ide_driveid_update()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 24 Mar 2009 22:22:58 +0000 (23:22 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Tue, 24 Mar 2009 22:22:58 +0000 (23:22 +0100)
Call SELECT_MASK() after ide_fix_driveid().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-iops.c

index 59c02184ba847b13ef6629da94aaf6c79bbbad8e..f92c63f564d2a902e9d80f258febed17ca4ef87a 100644 (file)
@@ -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];