aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ds.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-07-25 13:10:22 +0200
committerDominik Brodowski <linux@dominikbrodowski.net>2010-08-03 09:04:19 +0200
commitad0c7be28bc7593da43f494f6d074767ea96ca59 (patch)
tree31db0dd8238bfb075e5d7b3adade482e24e5e352 /drivers/pcmcia/ds.c
parent8f677ea07a2a934ac74ffa57db0f5617aec15ddf (diff)
downloadkernel_samsung_smdk4412-ad0c7be28bc7593da43f494f6d074767ea96ca59.zip
kernel_samsung_smdk4412-ad0c7be28bc7593da43f494f6d074767ea96ca59.tar.gz
kernel_samsung_smdk4412-ad0c7be28bc7593da43f494f6d074767ea96ca59.tar.bz2
pcmcia: insert PCMCIA device resources into resource tree
Insert PCMCIA device resources into the resource tree. However, this is currently only implemented for sockets which do not statically map the resources. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r--drivers/pcmcia/ds.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 028c973..55570d9 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -553,11 +553,11 @@ static struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s,
p_dev->function_config = c;
kref_init(&c->ref);
for (i = 0; i < MAX_IO_WIN; i++) {
- c->io[i].name = dev_name(&p_dev->dev);
+ c->io[i].name = p_dev->devname;
c->io[i].flags = IORESOURCE_IO;
}
for (i = 0; i< MAX_WIN; i++) {
- c->mem[i].name = dev_name(&p_dev->dev);
+ c->mem[i].name = p_dev->devname;
c->mem[i].flags = IORESOURCE_MEM;
}
}