diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /drivers/pnp/card.c | |
parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'drivers/pnp/card.c')
-rw-r--r-- | drivers/pnp/card.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index a762a4176736..e75b060daa95 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c | |||
@@ -8,6 +8,7 @@ | |||
8 | #include <linux/ctype.h> | 8 | #include <linux/ctype.h> |
9 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
10 | #include <linux/pnp.h> | 10 | #include <linux/pnp.h> |
11 | #include <linux/dma-mapping.h> | ||
11 | #include "base.h" | 12 | #include "base.h" |
12 | 13 | ||
13 | LIST_HEAD(pnp_cards); | 14 | LIST_HEAD(pnp_cards); |
@@ -101,7 +102,7 @@ static int card_probe(struct pnp_card *card, struct pnp_card_driver *drv) | |||
101 | * @id: pointer to a pnp_id structure | 102 | * @id: pointer to a pnp_id structure |
102 | * @card: pointer to the desired card | 103 | * @card: pointer to the desired card |
103 | */ | 104 | */ |
104 | struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id) | 105 | static struct pnp_id *pnp_add_card_id(struct pnp_card *card, char *id) |
105 | { | 106 | { |
106 | struct pnp_id *dev_id, *ptr; | 107 | struct pnp_id *dev_id, *ptr; |
107 | 108 | ||
@@ -167,6 +168,9 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnp | |||
167 | sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number, | 168 | sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number, |
168 | card->number); | 169 | card->number); |
169 | 170 | ||
171 | card->dev.coherent_dma_mask = DMA_24BIT_MASK; | ||
172 | card->dev.dma_mask = &card->dev.coherent_dma_mask; | ||
173 | |||
170 | dev_id = pnp_add_card_id(card, pnpid); | 174 | dev_id = pnp_add_card_id(card, pnpid); |
171 | if (!dev_id) { | 175 | if (!dev_id) { |
172 | kfree(card); | 176 | kfree(card); |