summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEddie C. Dost <ecd@brainaid.de>2005-07-06 15:41:54 -0700
committerDavid S. Miller <davem@davemloft.net>2005-07-06 15:41:54 -0700
commite3e01d6005ab4b0877f1fb3efef7f5b745e743be (patch)
tree0cb9fc0f68159edf52c08ee63b7891e0efba8942
parent9d7495330be2fd88ab939fa5080d3ca9f64368c2 (diff)
downloadop-kernel-dev-e3e01d6005ab4b0877f1fb3efef7f5b745e743be.zip
op-kernel-dev-e3e01d6005ab4b0877f1fb3efef7f5b745e743be.tar.gz
[SPARC64]: Fix enable_dma() in asm-sparc64/parport.h
Call ebus_dma_enable() before calling ebus_dma_request(), otherwise ebus_dma_request() returns -EINVAL and enable_dma() calls BUG()... Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/asm-sparc64/parport.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/parport.h b/include/asm-sparc64/parport.h
index b7e6355..56b5197d 100644
--- a/include/asm-sparc64/parport.h
+++ b/include/asm-sparc64/parport.h
@@ -27,12 +27,12 @@ static struct sparc_ebus_info {
static __inline__ void enable_dma(unsigned int dmanr)
{
+ ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
+
if (ebus_dma_request(&sparc_ebus_dmas[dmanr].info,
sparc_ebus_dmas[dmanr].addr,
sparc_ebus_dmas[dmanr].count))
BUG();
-
- ebus_dma_enable(&sparc_ebus_dmas[dmanr].info, 1);
}
static __inline__ void disable_dma(unsigned int dmanr)
OpenPOWER on IntegriCloud