aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/rsrc_iodyn.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/rsrc_iodyn.c')
-rw-r--r--drivers/pcmcia/rsrc_iodyn.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
index d0bf35021065..8510c35d2952 100644
--- a/drivers/pcmcia/rsrc_iodyn.c
+++ b/drivers/pcmcia/rsrc_iodyn.c
@@ -16,7 +16,6 @@
16#include <linux/module.h> 16#include <linux/module.h>
17#include <linux/kernel.h> 17#include <linux/kernel.h>
18 18
19#include <pcmcia/cs_types.h>
20#include <pcmcia/ss.h> 19#include <pcmcia/ss.h>
21#include <pcmcia/cs.h> 20#include <pcmcia/cs.h>
22#include <pcmcia/cistpl.h> 21#include <pcmcia/cistpl.h>
@@ -88,7 +87,7 @@ static struct resource *__iodyn_find_io_region(struct pcmcia_socket *s,
88 87
89static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr, 88static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
90 unsigned int *base, unsigned int num, 89 unsigned int *base, unsigned int num,
91 unsigned int align) 90 unsigned int align, struct resource **parent)
92{ 91{
93 int i, ret = 0; 92 int i, ret = 0;
94 93
@@ -129,6 +128,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
129 ((res->flags & ~IORESOURCE_BITS) | 128 ((res->flags & ~IORESOURCE_BITS) |
130 (attr & IORESOURCE_BITS)); 129 (attr & IORESOURCE_BITS));
131 s->io[i].InUse = num; 130 s->io[i].InUse = num;
131 *parent = res;
132 return 0; 132 return 0;
133 } 133 }
134 134
@@ -140,6 +140,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
140 continue; 140 continue;
141 *base = try; 141 *base = try;
142 s->io[i].InUse += num; 142 s->io[i].InUse += num;
143 *parent = res;
143 return 0; 144 return 0;
144 } 145 }
145 146
@@ -152,6 +153,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
152 continue; 153 continue;
153 *base = try; 154 *base = try;
154 s->io[i].InUse += num; 155 s->io[i].InUse += num;
156 *parent = res;
155 return 0; 157 return 0;
156 } 158 }
157 } 159 }
@@ -164,8 +166,6 @@ struct pccard_resource_ops pccard_iodyn_ops = {
164 .validate_mem = NULL, 166 .validate_mem = NULL,
165 .find_io = iodyn_find_io, 167 .find_io = iodyn_find_io,
166 .find_mem = NULL, 168 .find_mem = NULL,
167 .add_io = NULL,
168 .add_mem = NULL,
169 .init = static_init, 169 .init = static_init,
170 .exit = NULL, 170 .exit = NULL,
171}; 171};