diff options
Diffstat (limited to 'drivers/ide/pci/scc_pata.c')
-rw-r--r-- | drivers/ide/pci/scc_pata.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c index 3e75bf5f5e37..9ce1d8059921 100644 --- a/drivers/ide/pci/scc_pata.c +++ b/drivers/ide/pci/scc_pata.c | |||
@@ -821,6 +821,12 @@ static void __devinit init_iops_scc(ide_hwif_t *hwif) | |||
821 | init_mmio_iops_scc(hwif); | 821 | init_mmio_iops_scc(hwif); |
822 | } | 822 | } |
823 | 823 | ||
824 | static int __devinit scc_init_dma(ide_hwif_t *hwif, | ||
825 | const struct ide_port_info *d) | ||
826 | { | ||
827 | return ide_allocate_dma_engine(hwif); | ||
828 | } | ||
829 | |||
824 | static u8 scc_cable_detect(ide_hwif_t *hwif) | 830 | static u8 scc_cable_detect(ide_hwif_t *hwif) |
825 | { | 831 | { |
826 | return ATA_CBL_PATA80; | 832 | return ATA_CBL_PATA80; |
@@ -885,6 +891,7 @@ static const struct ide_dma_ops scc_dma_ops = { | |||
885 | { \ | 891 | { \ |
886 | .name = name_str, \ | 892 | .name = name_str, \ |
887 | .init_iops = init_iops_scc, \ | 893 | .init_iops = init_iops_scc, \ |
894 | .init_dma = scc_init_dma, \ | ||
888 | .init_hwif = init_hwif_scc, \ | 895 | .init_hwif = init_hwif_scc, \ |
889 | .tp_ops = &scc_tp_ops, \ | 896 | .tp_ops = &scc_tp_ops, \ |
890 | .port_ops = &scc_port_ops, \ | 897 | .port_ops = &scc_port_ops, \ |
@@ -922,13 +929,6 @@ static void __devexit scc_remove(struct pci_dev *dev) | |||
922 | { | 929 | { |
923 | struct scc_ports *ports = pci_get_drvdata(dev); | 930 | struct scc_ports *ports = pci_get_drvdata(dev); |
924 | struct ide_host *host = ports->host; | 931 | struct ide_host *host = ports->host; |
925 | ide_hwif_t *hwif = host->ports[0]; | ||
926 | |||
927 | if (hwif->dmatable_cpu) { | ||
928 | pci_free_consistent(dev, PRD_ENTRIES * PRD_BYTES, | ||
929 | hwif->dmatable_cpu, hwif->dmatable_dma); | ||
930 | hwif->dmatable_cpu = NULL; | ||
931 | } | ||
932 | 932 | ||
933 | ide_host_remove(host); | 933 | ide_host_remove(host); |
934 | 934 | ||