Hello.
Bartlomiej Zolnierkiewicz wrote:
* Set hwif->dma_base only if allocation of extra ports succeeds.
* Allocate hwif->dmatable_cpu before reserving I/O ports.
Looks like a bit of teardown code was missed with that change...
While at it:
* Move setting of hwif->dma_{base,master} from ide_{mapped_mmio,iomio}_dma()
to ide_setup_dma().
* Rename 'dma_base' argument to 'base' in ide_setup_dma().
I'm not sure what that achieves...
* Remove stale ide_setup_dma() comment.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
@@ -1006,18 +994,20 @@ static int ide_dma_iobase(ide_hwif_t *hw
return ide_iomio_dma(hwif, base, ports);
}
-/*
- * This can be called for a dynamically installed interface. Don't __init it
- */
-void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_ports)
+void ide_setup_dma(ide_hwif_t *hwif, unsigned long base, unsigned num_ports)
{
- if (ide_dma_iobase(hwif, dma_base, num_ports))
+ if (ide_allocate_dma_engine(hwif))
return;
- if (ide_allocate_dma_engine(hwif)) {
- ide_release_dma(hwif);
+ if (ide_dma_iobase(hwif, base, num_ports))
Why no ide_release_dma_engine() call here?
MBR, Sergei
-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
