aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index b4f8ca106639..1bb4b2c0e2f4 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -87,20 +87,20 @@ static void ide_disk_init_chs(ide_drive_t *drive)
87 87
88static void ide_disk_init_mult_count(ide_drive_t *drive) 88static void ide_disk_init_mult_count(ide_drive_t *drive)
89{ 89{
90 struct hd_driveid *id = drive->driveid; 90 u16 *id = drive->id;
91 u8 max_multsect = id[ATA_ID_MAX_MULTSECT] & 0xff;
91 92
92 if (id->max_multsect) { 93 if (max_multsect) {
93#ifdef CONFIG_IDEDISK_MULTI_MODE 94#ifdef CONFIG_IDEDISK_MULTI_MODE
94 if ((id->max_multsect / 2) > 1) { 95 if ((max_multsect / 2) > 1)
95 id->multsect = id->max_multsect; 96 id[ATA_ID_MULTSECT] = max_multsect | 0x100;
96 id->multsect_valid = 1; 97 else
97 } else { 98 id[ATA_ID_MULTSECT] &= ~0x1ff;
98 id->multsect = 0; 99
99 id->multsect_valid = 0; 100 drive->mult_req = id[ATA_ID_MULTSECT] & 0xff;
100 }
101 drive->mult_req = id->multsect;
102#endif 101#endif
103 if ((id->multsect_valid & 1) && id->multsect) 102 if ((id[ATA_ID_MULTSECT] & 0x100) &&
103 (id[ATA_ID_MULTSECT] & 0xff))
104 drive->special.b.set_multmode = 1; 104 drive->special.b.set_multmode = 1;
105 } 105 }
106} 106}