summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2003-01-12 14:50:41 +0000
committerRussell King <rmk@flint.arm.linux.org.uk>2003-01-12 14:50:41 +0000
commit470104435ce22b4faec6eec351ba71851e817f59 (patch)
treeef003a1a3c92ffc54d6ad49749828bf12939a8fd
parent6bc3d2ac1dc6a37c7239adfdcbc56539c985743b (diff)
[ARM] Ensure that dev->dma_mask is initialised for Acorn cards.
-rw-r--r--arch/arm/kernel/ecard.c2
-rw-r--r--include/asm-arm/ecard.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 1206e7d9fd66..a6c0c1993306 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -978,6 +978,8 @@ ecard_probe(int slot, card_type_t type)
strcpy(ec->dev.name, "fixme!");
ec->dev.parent = NULL;
ec->dev.bus = &ecard_bus_type;
+ ec->dev.dma_mask = &ec->dma_mask;
+ ec->dma_mask = (u64)0xffffffff;
device_register(&ec->dev);
diff --git a/include/asm-arm/ecard.h b/include/asm-arm/ecard.h
index 1c9ecdadecd9..602dc63b9dfa 100644
--- a/include/asm-arm/ecard.h
+++ b/include/asm-arm/ecard.h
@@ -160,6 +160,7 @@ struct expansion_card {
const char *card_desc; /* Card description */
CONST unsigned int podaddr; /* Base Linux address for card */
CONST loader_t loader; /* loader program */
+ u64 dma_mask;
};
struct in_chunk_dir {