diff options
-rw-r--r-- | drivers/ide/aec62xx.c | 1 | ||||
-rw-r--r-- | drivers/ide/ide-xfer-mode.c | 2 | ||||
-rw-r--r-- | include/linux/ide.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c index 878f8ec6dbe1..4c869872eb9a 100644 --- a/drivers/ide/aec62xx.c +++ b/drivers/ide/aec62xx.c | |||
@@ -136,6 +136,7 @@ static void aec6260_set_mode(ide_drive_t *drive, const u8 speed) | |||
136 | 136 | ||
137 | static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) | 137 | static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) |
138 | { | 138 | { |
139 | drive->dma_mode = pio + XFER_PIO_0; | ||
139 | drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0); | 140 | drive->hwif->port_ops->set_dma_mode(drive, pio + XFER_PIO_0); |
140 | } | 141 | } |
141 | 142 | ||
diff --git a/drivers/ide/ide-xfer-mode.c b/drivers/ide/ide-xfer-mode.c index cdae463f6b41..c2323869d92a 100644 --- a/drivers/ide/ide-xfer-mode.c +++ b/drivers/ide/ide-xfer-mode.c | |||
@@ -167,9 +167,11 @@ int ide_set_dma_mode(ide_drive_t *drive, const u8 mode) | |||
167 | if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) { | 167 | if (hwif->host_flags & IDE_HFLAG_POST_SET_MODE) { |
168 | if (ide_config_drive_speed(drive, mode)) | 168 | if (ide_config_drive_speed(drive, mode)) |
169 | return -1; | 169 | return -1; |
170 | drive->dma_mode = mode; | ||
170 | port_ops->set_dma_mode(drive, mode); | 171 | port_ops->set_dma_mode(drive, mode); |
171 | return 0; | 172 | return 0; |
172 | } else { | 173 | } else { |
174 | drive->dma_mode = mode; | ||
173 | port_ops->set_dma_mode(drive, mode); | 175 | port_ops->set_dma_mode(drive, mode); |
174 | return ide_config_drive_speed(drive, mode); | 176 | return ide_config_drive_speed(drive, mode); |
175 | } | 177 | } |
diff --git a/include/linux/ide.h b/include/linux/ide.h index b5d2e9655059..746ef9fdabcb 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -516,6 +516,7 @@ struct ide_drive_s { | |||
516 | u8 current_speed; /* current transfer rate set */ | 516 | u8 current_speed; /* current transfer rate set */ |
517 | u8 desired_speed; /* desired transfer rate set */ | 517 | u8 desired_speed; /* desired transfer rate set */ |
518 | u8 pio_mode; /* for ->set_pio_mode _only_ */ | 518 | u8 pio_mode; /* for ->set_pio_mode _only_ */ |
519 | u8 dma_mode; /* for ->dma_pio_mode _only_ */ | ||
519 | u8 dn; /* now wide spread use */ | 520 | u8 dn; /* now wide spread use */ |
520 | u8 acoustic; /* acoustic management */ | 521 | u8 acoustic; /* acoustic management */ |
521 | u8 media; /* disk, cdrom, tape, floppy, ... */ | 522 | u8 media; /* disk, cdrom, tape, floppy, ... */ |