[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 0668384ebc8bf8a4bbc0b43b522e5c7a221259c8..b02598a5a912ec96c690b2476775c7f0f63493c0 100644 (file)
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -98,10 +98,12 @@ 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);