aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/rsrc_iodyn.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_iodyn.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_iodyn.c')
-rw-r--r--drivers/pcmcia/rsrc_iodyn.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
index 3b1dce2df26a..8510c35d2952 100644
--- a/drivers/pcmcia/rsrc_iodyn.c
+++ b/drivers/pcmcia/rsrc_iodyn.c
@@ -87,7 +87,7 @@ static struct resource *__iodyn_find_io_region(struct pcmcia_socket *s,
87 87
88static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr, 88static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
89 unsigned int *base, unsigned int num, 89 unsigned int *base, unsigned int num,
90 unsigned int align) 90 unsigned int align, struct resource **parent)
91{ 91{
92 int i, ret = 0; 92 int i, ret = 0;
93 93
@@ -128,6 +128,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
128 ((res->flags & ~IORESOURCE_BITS) | 128 ((res->flags & ~IORESOURCE_BITS) |
129 (attr & IORESOURCE_BITS)); 129 (attr & IORESOURCE_BITS));
130 s->io[i].InUse = num; 130 s->io[i].InUse = num;
131 *parent = res;
131 return 0; 132 return 0;
132 } 133 }
133 134
@@ -139,6 +140,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
139 continue; 140 continue;
140 *base = try; 141 *base = try;
141 s->io[i].InUse += num; 142 s->io[i].InUse += num;
143 *parent = res;
142 return 0; 144 return 0;
143 } 145 }
144 146
@@ -151,6 +153,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
151 continue; 153 continue;
152 *base = try; 154 *base = try;
153 s->io[i].InUse += num; 155 s->io[i].InUse += num;
156 *parent = res;
154 return 0; 157 return 0;
155 } 158 }
156 } 159 }