diff options
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
-rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index b6843f8d300d..0668384ebc8b 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
@@ -72,7 +72,7 @@ int pcmcia_adjust_resource_info(adjust_t *adj) | |||
72 | /* you can't use the old interface if the new | 72 | /* you can't use the old interface if the new |
73 | * one was used before */ | 73 | * one was used before */ |
74 | spin_lock_irqsave(&s->lock, flags); | 74 | spin_lock_irqsave(&s->lock, flags); |
75 | if ((s->resource_setup_done) && | 75 | if ((s->resource_setup_new) && |
76 | !(s->resource_setup_old)) { | 76 | !(s->resource_setup_old)) { |
77 | spin_unlock_irqrestore(&s->lock, flags); | 77 | spin_unlock_irqrestore(&s->lock, flags); |
78 | continue; | 78 | continue; |
@@ -105,29 +105,32 @@ void pcmcia_validate_mem(struct pcmcia_socket *s) | |||
105 | } | 105 | } |
106 | EXPORT_SYMBOL(pcmcia_validate_mem); | 106 | EXPORT_SYMBOL(pcmcia_validate_mem); |
107 | 107 | ||
108 | int adjust_io_region(struct resource *res, unsigned long r_start, | 108 | int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start, |
109 | unsigned long r_end, struct pcmcia_socket *s) | 109 | unsigned long r_end, struct pcmcia_socket *s) |
110 | { | 110 | { |
111 | if (s->resource_ops->adjust_io_region) | 111 | if (s->resource_ops->adjust_io_region) |
112 | return s->resource_ops->adjust_io_region(res, r_start, r_end, s); | 112 | return s->resource_ops->adjust_io_region(res, r_start, r_end, s); |
113 | return -ENOMEM; | 113 | return -ENOMEM; |
114 | } | 114 | } |
115 | EXPORT_SYMBOL(pcmcia_adjust_io_region); | ||
115 | 116 | ||
116 | struct resource *find_io_region(unsigned long base, int num, | 117 | struct resource *pcmcia_find_io_region(unsigned long base, int num, |
117 | unsigned long align, struct pcmcia_socket *s) | 118 | unsigned long align, struct pcmcia_socket *s) |
118 | { | 119 | { |
119 | if (s->resource_ops->find_io) | 120 | if (s->resource_ops->find_io) |
120 | return s->resource_ops->find_io(base, num, align, s); | 121 | return s->resource_ops->find_io(base, num, align, s); |
121 | return NULL; | 122 | return NULL; |
122 | } | 123 | } |
124 | EXPORT_SYMBOL(pcmcia_find_io_region); | ||
123 | 125 | ||
124 | struct resource *find_mem_region(u_long base, u_long num, u_long align, | 126 | struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align, |
125 | int low, struct pcmcia_socket *s) | 127 | int low, struct pcmcia_socket *s) |
126 | { | 128 | { |
127 | if (s->resource_ops->find_mem) | 129 | if (s->resource_ops->find_mem) |
128 | return s->resource_ops->find_mem(base, num, align, low, s); | 130 | return s->resource_ops->find_mem(base, num, align, low, s); |
129 | return NULL; | 131 | return NULL; |
130 | } | 132 | } |
133 | EXPORT_SYMBOL(pcmcia_find_mem_region); | ||
131 | 134 | ||
132 | void release_resource_db(struct pcmcia_socket *s) | 135 | void release_resource_db(struct pcmcia_socket *s) |
133 | { | 136 | { |