lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pcmcia: avoid duble iounmap of one address

Browse Source 
Avoid double iounmap of one address, and disable cis_virt if set_mem_map
failed.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dominik Brodowski
2005-07-28 01:07:23 -07:00
committed by Linus Torvalds
parent dc33a4a36c
commit 2e5a3e7909
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/pcmcia/cistpl.c
View File

@@ -88,31 +88,38 @@ EXPORT_SYMBOL(release_cis_mem);
static void __iomem * static void __iomem *
set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flags) set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flags)
{ {
pccard_mem_map *mem = &s->cis_mem; pccard_mem_map *mem = &s->cis_mem;
int ret; int ret;
if (!(s->features & SS_CAP_STATIC_MAP) && mem->res == NULL) { if (!(s->features & SS_CAP_STATIC_MAP) && (mem->res == NULL)) {
mem->res = pcmcia_find_mem_region(0, s->map_size, s->map_size, 0, s); mem->res = pcmcia_find_mem_region(0, s->map_size, s->map_size, 0, s);
if (mem->res == NULL) { if (mem->res == NULL) {
printk(KERN_NOTICE "cs: unable to map card memory!\n"); printk(KERN_NOTICE "cs: unable to map card memory!\n");
return NULL; return NULL;
}
s->cis_virt = NULL;
} }
s->cis_virt = ioremap(mem->res->start, s->map_size);
}
mem->card_start = card_offset;
mem->flags = flags;
ret = s->ops->set_mem_map(s, mem);
if (ret) {
iounmap(s->cis_virt);
return NULL;
}
if (s->features & SS_CAP_STATIC_MAP) { if (!(s->features & SS_CAP_STATIC_MAP) && (!s->cis_virt))
if (s->cis_virt) s->cis_virt = ioremap(mem->res->start, s->map_size);
iounmap(s->cis_virt);
s->cis_virt = ioremap(mem->static_start, s->map_size); mem->card_start = card_offset;
} mem->flags = flags;
return s->cis_virt;
ret = s->ops->set_mem_map(s, mem);
if (ret) {
iounmap(s->cis_virt);
s->cis_virt = NULL;
return NULL;
}
if (s->features & SS_CAP_STATIC_MAP) {
if (s->cis_virt)
iounmap(s->cis_virt);
s->cis_virt = ioremap(mem->static_start, s->map_size);
}
return s->cis_virt;
} }
/*====================================================================== /*======================================================================