aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/rsrc_mgr.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-25 07:10:22 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 03:04:19 -0400
commitad0c7be28bc7593da43f494f6d074767ea96ca59 (patch)
tree31db0dd8238bfb075e5d7b3adade482e24e5e352 /drivers/pcmcia/rsrc_mgr.c
parent8f677ea07a2a934ac74ffa57db0f5617aec15ddf (diff)
pcmcia: insert PCMCIA device resources into resource tree
Insert PCMCIA device resources into the resource tree. However, this is currently only implemented for sockets which do not statically map the resources. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
-rw-r--r--drivers/pcmcia/rsrc_mgr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index b433a7995651..4e80421fd908 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -47,11 +47,12 @@ struct resource *pcmcia_make_resource(unsigned long start, unsigned long end,
47 47
48static int static_find_io(struct pcmcia_socket *s, unsigned int attr, 48static int static_find_io(struct pcmcia_socket *s, unsigned int attr,
49 unsigned int *base, unsigned int num, 49 unsigned int *base, unsigned int num,
50 unsigned int align) 50 unsigned int align, struct resource **parent)
51{ 51{
52 if (!s->io_offset) 52 if (!s->io_offset)
53 return -EINVAL; 53 return -EINVAL;
54 *base = s->io_offset | (*base & 0x0fff); 54 *base = s->io_offset | (*base & 0x0fff);
55 *parent = NULL;
55 56
56 return 0; 57 return 0;
57} 58}