Skip to content

Commit

Permalink
fix cirrusfb breakage
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 16, 2007
1 parent b883a68 commit d91f5bb
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/video/cirrusfb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2225,8 +2225,9 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
#endif /* CONFIG_PCI */

#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);

if (cinfo->btype == BT_PICASSO4) {
Expand Down Expand Up @@ -2573,7 +2574,7 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
printk(KERN_INFO "Cirrus Logic chipset on Zorro bus\n");
zorro_set_drvdata(z, info);

ret = cirrusfb_register(cinfo);
ret = cirrusfb_register(info);
if (ret) {
if (btype == BT_PICASSO4) {
iounmap(info->screen_base);
Expand Down

0 comments on commit d91f5bb

Please sign in to comment.