OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cirrusfb: fix error paths in cirrusfb_xxx_register() 

Balance iomap and iounmap and alloc and free calls in case of error druing
device register (probing).

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Krzysztof Helt 2009-03-31 15:25:12 -07:00 committed by Linus Torvalds
parent 9e84806253
commit bc5d8ac02f
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/video/cirrusfb.c
View File

@ -2090,8 +2090,6 @@ static int __devinit cirrusfb_register(struct fb_info *info)
err_dealloc_cmap: err_dealloc_cmap:
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);
cinfo->unmap(info);
framebuffer_release(info);
return err; return err;
} }
@ -2328,18 +2326,15 @@ static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
zorro_set_drvdata(z, info); zorro_set_drvdata(z, info);
ret = cirrusfb_register(info); ret = cirrusfb_register(info);
if (ret) { if (!ret)
if (btype == BT_PICASSO4) { return 0;
iounmap(info->screen_base);
iounmap(cinfo->regbase - 0x600000); if (btype == BT_PICASSO4 || board_addr > 0x01000000)
} else if (board_addr > 0x01000000) iounmap(info->screen_base);
iounmap(info->screen_base);
}
return ret;
err_unmap_regbase: err_unmap_regbase:
/* Parental advisory: explicit hack */ if (btype == BT_PICASSO4)
iounmap(cinfo->regbase - 0x600000); iounmap(cinfo->regbase - 0x600000);
err_release_region: err_release_region:
release_region(board_addr, board_size); release_region(board_addr, board_size);
err_release_fb: err_release_fb: