[PATCH] pcmcia: validate_mem shouldn't be void

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / rsrc_mgr.c

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index b6843f8d300d20a3d6d5f503917fbd0229685f2b..b02598a5a912ec96c690b2476775c7f0f63493c0 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -72,7 +72,7 @@ int pcmcia_adjust_resource_info(adjust_t *adj)
                        /* you can't use the old interface if the new
                         * one was used before */
                        spin_lock_irqsave(&s->lock, flags);
-                       if ((s->resource_setup_done) &&
+                       if ((s->resource_setup_new) &&
                            !(s->resource_setup_old)) {
                                spin_unlock_irqrestore(&s->lock, flags);
                                continue;
@@ -98,36 +98,41 @@ int pcmcia_adjust_resource_info(adjust_t *adj)
 }
 EXPORT_SYMBOL(pcmcia_adjust_resource_info);
 
-void pcmcia_validate_mem(struct pcmcia_socket *s)
+int pcmcia_validate_mem(struct pcmcia_socket *s)
 {
        if (s->resource_ops->validate_mem)
-               s->resource_ops->validate_mem(s);
+               return s->resource_ops->validate_mem(s);
+       /* if there is no callback, we can assume that everything is OK */
+       return 0;
 }
 EXPORT_SYMBOL(pcmcia_validate_mem);
 
-int adjust_io_region(struct resource *res, unsigned long r_start,
+int pcmcia_adjust_io_region(struct resource *res, unsigned long r_start,
                     unsigned long r_end, struct pcmcia_socket *s)
 {
        if (s->resource_ops->adjust_io_region)
                return s->resource_ops->adjust_io_region(res, r_start, r_end, s);
        return -ENOMEM;
 }
+EXPORT_SYMBOL(pcmcia_adjust_io_region);
 
-struct resource *find_io_region(unsigned long base, int num,
+struct resource *pcmcia_find_io_region(unsigned long base, int num,
                   unsigned long align, struct pcmcia_socket *s)
 {
        if (s->resource_ops->find_io)
                return s->resource_ops->find_io(base, num, align, s);
        return NULL;
 }
+EXPORT_SYMBOL(pcmcia_find_io_region);
 
-struct resource *find_mem_region(u_long base, u_long num, u_long align,
+struct resource *pcmcia_find_mem_region(u_long base, u_long num, u_long align,
                                 int low, struct pcmcia_socket *s)
 {
        if (s->resource_ops->find_mem)
                return s->resource_ops->find_mem(base, num, align, low, s);
        return NULL;
 }
+EXPORT_SYMBOL(pcmcia_find_mem_region);
 
 void release_resource_db(struct pcmcia_socket *s)
 {