diff options
| author |   David S. Miller <davem@sunset.davemloft.net> | 2007-07-27 22:39:14 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-30 00:27:34 -0700 |
| commit | ad7ad57c6127042c411353dddb723765964815db (patch) | |
| tree | 600484291d9cfa68d54dc9b230f5bd115f495213 /include/asm-sparc64/parport.h | |
| parent | [VIDEO]: Fix OOPS in all SBUS framebuffer drivers. (diff) | |
| download | linux-dev-ad7ad57c6127042c411353dddb723765964815db.tar.xz linux-dev-ad7ad57c6127042c411353dddb723765964815db.zip | |
[SPARC64]: Fix conflicts in SBUS/PCI/EBUS/ISA DMA handling.
Fully unify all of the DMA ops so that subordinate bus types to
the DMA operation providers (such as ebus, isa, of_device) can
work transparently.
Basically, we just make sure that for every system device we
create, the dev->archdata 'iommu' and 'stc' fields are filled
in.
Then we have two platform variants of the DMA ops, one for SUN4U which
actually programs the real hardware, and one for SUN4V which makes
hypervisor calls.
This also fixes the crashes in parport_pc on sparc64, reported by
Meelis Roos.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64/parport.h')
| -rw-r--r-- | include/asm-sparc64/parport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h index 600afe5ae2e3..8116e8f6062c 100644 --- a/include/asm-sparc64/parport.h +++ b/include/asm-sparc64/parport.h @@ -117,7 +117,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id if (!strcmp(parent->name, "dma")) { p = parport_pc_probe_port(base, base + 0x400, op->irqs[0], PARPORT_DMA_NOFIFO, - op->dev.parent); + op->dev.parent->parent); if (!p) return -ENOMEM; dev_set_drvdata(&op->dev, p); |