diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:58 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-24 18:22:58 -0400 |
commit | f323b80dceaca858f8e240ca098681fcfe7fd3c4 (patch) | |
tree | 4e8b9485772942569dfe93bc90d9f0ed30624508 /drivers/ide/ide-iops.c | |
parent | 1bd4c1f4fe6607a0253d1318847b618a2a598612 (diff) |
ide: sanitize SELECT_MASK() usage in ide_driveid_update()
Call SELECT_MASK() after ide_fix_driveid().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r-- | drivers/ide/ide-iops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 59c02184ba84..f92c63f564d2 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -340,13 +340,15 @@ int ide_driveid_update(ide_drive_t *drive) | |||
340 | } | 340 | } |
341 | 341 | ||
342 | local_irq_save(flags); | 342 | local_irq_save(flags); |
343 | SELECT_MASK(drive, 0); | ||
344 | tp_ops->input_data(drive, NULL, id, SECTOR_SIZE); | 343 | tp_ops->input_data(drive, NULL, id, SECTOR_SIZE); |
345 | (void)tp_ops->read_status(hwif); /* clear drive IRQ */ | 344 | (void)tp_ops->read_status(hwif); /* clear drive IRQ */ |
346 | local_irq_enable(); | 345 | local_irq_enable(); |
347 | local_irq_restore(flags); | 346 | local_irq_restore(flags); |
347 | |||
348 | ide_fix_driveid(id); | 348 | ide_fix_driveid(id); |
349 | 349 | ||
350 | SELECT_MASK(drive, 0); | ||
351 | |||
350 | drive->id[ATA_ID_UDMA_MODES] = id[ATA_ID_UDMA_MODES]; | 352 | drive->id[ATA_ID_UDMA_MODES] = id[ATA_ID_UDMA_MODES]; |
351 | drive->id[ATA_ID_MWDMA_MODES] = id[ATA_ID_MWDMA_MODES]; | 353 | drive->id[ATA_ID_MWDMA_MODES] = id[ATA_ID_MWDMA_MODES]; |
352 | drive->id[ATA_ID_SWDMA_MODES] = id[ATA_ID_SWDMA_MODES]; | 354 | drive->id[ATA_ID_SWDMA_MODES] = id[ATA_ID_SWDMA_MODES]; |