aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ds.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-24 13:03:02 -0400
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 03:04:16 -0400
commit0ca724d37af370dbf2d55dc4d6359ead558e5756 (patch)
tree994685118202d9bf54f11ec9b39a654f6fb4f21f /drivers/pcmcia/ds.c
parentb5cb259e7fac5536c4ddf350af6a3d6cc950e47e (diff)
pcmcia: use struct resource for PCMCIA devices, part 2
Use struct resource * also for iomem resources. CC: linux-mtd@lists.infradead.org CC: netdev@vger.kernel.org CC: linux-wireless@vger.kernel.org CC: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r--drivers/pcmcia/ds.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 7ddd19a4033d..0bb780c3f263 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -556,9 +556,15 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
556 c->io[i].name = dev_name(&p_dev->dev); 556 c->io[i].name = dev_name(&p_dev->dev);
557 c->io[i].flags = IORESOURCE_IO; 557 c->io[i].flags = IORESOURCE_IO;
558 } 558 }
559 for (i = 0; i< MAX_WIN; i++) {
560 c->mem[i].name = dev_name(&p_dev->dev);
561 c->mem[i].flags = IORESOURCE_MEM;
562 }
559 } 563 }
560 for (i = 0; i < MAX_IO_WIN; i++) 564 for (i = 0; i < MAX_IO_WIN; i++)
561 p_dev->resource[i] = &p_dev->function_config->io[i]; 565 p_dev->resource[i] = &p_dev->function_config->io[i];
566 for (; i < (MAX_IO_WIN + MAX_WIN); i++)
567 p_dev->resource[i] = &p_dev->function_config->mem[i-MAX_IO_WIN];
562 568
563 mutex_unlock(&s->ops_mutex); 569 mutex_unlock(&s->ops_mutex);
564 570