aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/rsrc_nonstatic.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/rsrc_nonstatic.c')
-rw-r--r--drivers/pcmcia/rsrc_nonstatic.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index c17a17d9f9b5..96f348b35fde 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -718,7 +718,7 @@ static struct resource *__nonstatic_find_io_region(struct pcmcia_socket *s,
718 718
719static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr, 719static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
720 unsigned int *base, unsigned int num, 720 unsigned int *base, unsigned int num,
721 unsigned int align) 721 unsigned int align, struct resource **parent)
722{ 722{
723 int i, ret = 0; 723 int i, ret = 0;
724 724
@@ -760,6 +760,7 @@ static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
760 ((res->flags & ~IORESOURCE_BITS) | 760 ((res->flags & ~IORESOURCE_BITS) |
761 (attr & IORESOURCE_BITS)); 761 (attr & IORESOURCE_BITS));
762 s->io[i].InUse = num; 762 s->io[i].InUse = num;
763 *parent = res;
763 return 0; 764 return 0;
764 } 765 }
765 766
@@ -775,6 +776,7 @@ static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
775 continue; 776 continue;
776 *base = try; 777 *base = try;
777 s->io[i].InUse += num; 778 s->io[i].InUse += num;
779 *parent = res;
778 return 0; 780 return 0;
779 } 781 }
780 } 782 }
@@ -793,6 +795,7 @@ static int nonstatic_find_io(struct pcmcia_socket *s, unsigned int attr,
793 continue; 795 continue;
794 *base = try; 796 *base = try;
795 s->io[i].InUse += num; 797 s->io[i].InUse += num;
798 *parent = res;
796 return 0; 799 return 0;
797 } 800 }
798 } 801 }