Espressi esp8089 WIFI

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

diff --git a/drivers/pcmcia/rsrc_iodyn.c b/drivers/pcmcia/rsrc_iodyn.c
index 8510c35d2952e5a264877632f22954c0de85c77f..f53c237bda2f0324d75a37efe5bb43f891ff52ff 100644 (file)
--- a/drivers/pcmcia/rsrc_iodyn.c
+++ b/drivers/pcmcia/rsrc_iodyn.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 
 #include <pcmcia/ss.h>
-#include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include "cs_internal.h"
 
@@ -136,7 +135,7 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
                try = res->end + 1;
                if ((*base == 0) || (*base == try)) {
                        if (adjust_resource(s->io[i].res, res->start,
-                                       res->end - res->start + num + 1))
+                                           resource_size(res) + num))
                                continue;
                        *base = try;
                        s->io[i].InUse += num;
@@ -148,8 +147,8 @@ static int iodyn_find_io(struct pcmcia_socket *s, unsigned int attr,
                try = res->start - num;
                if ((*base == 0) || (*base == try)) {
                        if (adjust_resource(s->io[i].res,
-                                       res->start - num,
-                                       res->end - res->start + num + 1))
+                                           res->start - num,
+                                           resource_size(res) + num))
                                continue;
                        *base = try;
                        s->io[i].InUse += num;