diff options
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r-- | drivers/ide/ide.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 095ff34870da..7819fbd4d5fd 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -433,14 +433,13 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) | |||
433 | hwif->atapi_input_bytes = tmp_hwif->atapi_input_bytes; | 433 | hwif->atapi_input_bytes = tmp_hwif->atapi_input_bytes; |
434 | hwif->atapi_output_bytes = tmp_hwif->atapi_output_bytes; | 434 | hwif->atapi_output_bytes = tmp_hwif->atapi_output_bytes; |
435 | 435 | ||
436 | hwif->dma_host_set = tmp_hwif->dma_host_set; | ||
436 | hwif->dma_setup = tmp_hwif->dma_setup; | 437 | hwif->dma_setup = tmp_hwif->dma_setup; |
437 | hwif->dma_exec_cmd = tmp_hwif->dma_exec_cmd; | 438 | hwif->dma_exec_cmd = tmp_hwif->dma_exec_cmd; |
438 | hwif->dma_start = tmp_hwif->dma_start; | 439 | hwif->dma_start = tmp_hwif->dma_start; |
439 | hwif->ide_dma_end = tmp_hwif->ide_dma_end; | 440 | hwif->ide_dma_end = tmp_hwif->ide_dma_end; |
440 | hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq; | 441 | hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq; |
441 | hwif->ide_dma_clear_irq = tmp_hwif->ide_dma_clear_irq; | 442 | hwif->ide_dma_clear_irq = tmp_hwif->ide_dma_clear_irq; |
442 | hwif->dma_host_on = tmp_hwif->dma_host_on; | ||
443 | hwif->dma_host_off = tmp_hwif->dma_host_off; | ||
444 | hwif->dma_lost_irq = tmp_hwif->dma_lost_irq; | 443 | hwif->dma_lost_irq = tmp_hwif->dma_lost_irq; |
445 | hwif->dma_timeout = tmp_hwif->dma_timeout; | 444 | hwif->dma_timeout = tmp_hwif->dma_timeout; |
446 | 445 | ||
@@ -834,7 +833,7 @@ int set_using_dma(ide_drive_t *drive, int arg) | |||
834 | if (!drive->id || !(drive->id->capability & 1)) | 833 | if (!drive->id || !(drive->id->capability & 1)) |
835 | goto out; | 834 | goto out; |
836 | 835 | ||
837 | if (hwif->dma_host_on == NULL) | 836 | if (hwif->dma_host_set == NULL) |
838 | goto out; | 837 | goto out; |
839 | 838 | ||
840 | err = -EBUSY; | 839 | err = -EBUSY; |