[ARM] Ensure that dev->dma_mask is initialised for Acorn cards.

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 1206e7d9fd669e1176ed1102a0c32513ea3b092e..a6c0c1993306c9f06a5a46d84258d12c83f2f81f 100644 (file)
--- 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 1c9ecdadecd9c52f0e0c254d930c8bce8733872d..602dc63b9dfa80efd34627e3992648e6169a3921 100644 (file)
--- 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 {