hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix cirrusfb breakage 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2007-10-17 00:27:18 +01:00 committed by Linus Torvalds
parent b883a688ce
commit d91f5bb69a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/video/cirrusfb.c
View File

@ -2225,8 +2225,9 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
#endif /* CONFIG_PCI */ #endif /* CONFIG_PCI */
#ifdef CONFIG_ZORRO #ifdef CONFIG_ZORRO
static void __devexit cirrusfb_zorro_unmap(struct cirrusfb_info *cinfo) static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
{ {
struct cirrusfb_info *cinfo = info->par;
zorro_release_device(cinfo->zdev); zorro_release_device(cinfo->zdev);
if (cinfo->btype == BT_PICASSO4) { if (cinfo->btype == BT_PICASSO4) {
@ -2573,7 +2574,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n"); printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
zorro_set_drvdata(z, info); zorro_set_drvdata(z, info);
ret = cirrusfb_register(cinfo); ret = cirrusfb_register(info);
if (ret) { if (ret) {
if (btype == BT_PICASSO4) { if (btype == BT_PICASSO4) {
iounmap(info->screen_base); iounmap(info->screen_base);