diff options
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index fa2be26272d5..c3432da78d52 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -669,9 +669,9 @@ static void | |||
669 | set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, | 669 | set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, |
670 | u8 speed) | 670 | u8 speed) |
671 | { | 671 | { |
672 | u16 *id = drive->id; | ||
672 | int cycleTime, accessTime = 0, recTime = 0; | 673 | int cycleTime, accessTime = 0, recTime = 0; |
673 | unsigned accessTicks, recTicks; | 674 | unsigned accessTicks, recTicks; |
674 | struct hd_driveid *id = drive->id; | ||
675 | struct mdma_timings_t* tm = NULL; | 675 | struct mdma_timings_t* tm = NULL; |
676 | int i; | 676 | int i; |
677 | 677 | ||
@@ -686,8 +686,8 @@ set_timings_mdma(ide_drive_t *drive, int intf_type, u32 *timings, u32 *timings2, | |||
686 | } | 686 | } |
687 | 687 | ||
688 | /* Check if drive provides explicit DMA cycle time */ | 688 | /* Check if drive provides explicit DMA cycle time */ |
689 | if ((id->field_valid & 2) && id->eide_dma_time) | 689 | if ((id[ATA_ID_FIELD_VALID] & 2) && id[ATA_ID_EIDE_DMA_TIME]) |
690 | cycleTime = max_t(int, id->eide_dma_time, cycleTime); | 690 | cycleTime = max_t(int, id[ATA_ID_EIDE_DMA_TIME], cycleTime); |
691 | 691 | ||
692 | /* OHare limits according to some old Apple sources */ | 692 | /* OHare limits according to some old Apple sources */ |
693 | if ((intf_type == controller_ohare) && (cycleTime < 150)) | 693 | if ((intf_type == controller_ohare) && (cycleTime < 150)) |