Commit d91f5bb6 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

fix cirrusfb breakage

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b883a688
...@@ -2225,8 +2225,9 @@ static void cirrusfb_pci_unmap(struct fb_info *info) ...@@ -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, ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment