diff options
Diffstat (limited to 'drivers/ide/alim15x3.c')
-rw-r--r-- | drivers/ide/alim15x3.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c index d3faf0b97f42..537da1cde16d 100644 --- a/drivers/ide/alim15x3.c +++ b/drivers/ide/alim15x3.c | |||
@@ -189,20 +189,20 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
189 | } | 189 | } |
190 | 190 | ||
191 | /** | 191 | /** |
192 | * ali15x3_dma_setup - begin a DMA phase | 192 | * ali_dma_check - DMA check |
193 | * @drive: target device | 193 | * @drive: target device |
194 | * @cmd: command | 194 | * @cmd: command |
195 | * | 195 | * |
196 | * Returns 1 if the DMA cannot be performed, zero on success. | 196 | * Returns 1 if the DMA cannot be performed, zero on success. |
197 | */ | 197 | */ |
198 | 198 | ||
199 | static int ali15x3_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd) | 199 | static int ali_dma_check(ide_drive_t *drive, struct ide_cmd *cmd) |
200 | { | 200 | { |
201 | if (m5229_revision < 0xC2 && drive->media != ide_disk) { | 201 | if (m5229_revision < 0xC2 && drive->media != ide_disk) { |
202 | if (cmd->tf_flags & IDE_TFLAG_WRITE) | 202 | if (cmd->tf_flags & IDE_TFLAG_WRITE) |
203 | return 1; /* try PIO instead of DMA */ | 203 | return 1; /* try PIO instead of DMA */ |
204 | } | 204 | } |
205 | return ide_dma_setup(drive, cmd); | 205 | return 0; |
206 | } | 206 | } |
207 | 207 | ||
208 | /** | 208 | /** |
@@ -503,11 +503,12 @@ static const struct ide_port_ops ali_port_ops = { | |||
503 | 503 | ||
504 | static const struct ide_dma_ops ali_dma_ops = { | 504 | static const struct ide_dma_ops ali_dma_ops = { |
505 | .dma_host_set = ide_dma_host_set, | 505 | .dma_host_set = ide_dma_host_set, |
506 | .dma_setup = ali15x3_dma_setup, | 506 | .dma_setup = ide_dma_setup, |
507 | .dma_start = ide_dma_start, | 507 | .dma_start = ide_dma_start, |
508 | .dma_end = ide_dma_end, | 508 | .dma_end = ide_dma_end, |
509 | .dma_test_irq = ide_dma_test_irq, | 509 | .dma_test_irq = ide_dma_test_irq, |
510 | .dma_lost_irq = ide_dma_lost_irq, | 510 | .dma_lost_irq = ide_dma_lost_irq, |
511 | .dma_check = ali_dma_check, | ||
511 | .dma_timer_expiry = ide_dma_sff_timer_expiry, | 512 | .dma_timer_expiry = ide_dma_sff_timer_expiry, |
512 | .dma_sff_read_status = ide_dma_sff_read_status, | 513 | .dma_sff_read_status = ide_dma_sff_read_status, |
513 | }; | 514 | }; |