aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/cirrusfb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index ce22bf5de350..f99cb77e7b42 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2225,8 +2225,9 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
2225#endif /* CONFIG_PCI */ 2225#endif /* CONFIG_PCI */
2226 2226
2227#ifdef CONFIG_ZORRO 2227#ifdef CONFIG_ZORRO
2228static void __devexit cirrusfb_zorro_unmap(struct cirrusfb_info *cinfo) 2228static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
2229{ 2229{
2230 struct cirrusfb_info *cinfo = info->par;
2230 zorro_release_device(cinfo->zdev); 2231 zorro_release_device(cinfo->zdev);
2231 2232
2232 if (cinfo->btype == BT_PICASSO4) { 2233 if (cinfo->btype == BT_PICASSO4) {
@@ -2573,7 +2574,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
2573 printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n"); 2574 printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
2574 zorro_set_drvdata(z, info); 2575 zorro_set_drvdata(z, info);
2575 2576
2576 ret = cirrusfb_register(cinfo); 2577 ret = cirrusfb_register(info);
2577 if (ret) { 2578 if (ret) {
2578 if (btype == BT_PICASSO4) { 2579 if (btype == BT_PICASSO4) {
2579 iounmap(info->screen_base); 2580 iounmap(info->screen_base);