1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c
index 52db17263d8b..f8401a0ef89b 100644
--- a/drivers/pcmcia/rsrc_mgr.c
+++ b/drivers/pcmcia/rsrc_mgr.c
@@ -114,22 +114,21 @@ struct pcmcia_align_data {
         unsigned long   offset;
 };
 
-static void pcmcia_align(void *align_data, struct resource *res,
-                        unsigned long size, unsigned long align)
+static resource_size_t pcmcia_align(void *align_data,
+                                const struct resource *res,
+                                resource_size_t size, resource_size_t align)
 {
         struct pcmcia_align_data *data = align_data;
-        unsigned long start;
+        resource_size_t start;
 
         start = (res->start & ~data->mask) + data->offset;
         if (start < res->start)
                 start += data->mask + 1;
-        res->start = start;
 
 #ifdef CONFIG_X86
         if (res->flags & IORESOURCE_IO) {
                 if (start & 0x300) {
                         start = (start + 0x3ff) & ~0x3ff;
-                        res->start = start;
                 }
         }
 #endif
@@ -137,9 +136,11 @@ static void pcmcia_align(void *align_data, struct resource *res,
 #ifdef CONFIG_M68K
         if (res->flags & IORESOURCE_IO) {
                 if ((res->start + size - 1) >= 1024)
-                        res->start = res->end;
+                        start = res->end;
         }
 #endif
+
+        return start;
 }