]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
staging/xgifb: fix dumpVGAReg compile error if DEBUG is set
authorPeter Huewe <peterhuewe@gmx.de>
Fri, 24 Jul 2015 23:59:08 +0000 (01:59 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 Jul 2015 23:14:53 +0000 (16:14 -0700)
If DEBUG is set dumpVGAReg is called and tries to access
XGISR which is defined as (xgifb_info->dev_info.P3c4)
which is not known within this function.

-> add as parameter to dumpVGAReg so xgifb_info becomes known

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/XGI_main_26.c

index 5bfe151ea3287b4f5fa497ab6211aa6f0c1802ef..5a6251a4511246756d2c6105fd9a382df51c1b42 100644 (file)
@@ -29,7 +29,7 @@ static unsigned int refresh_rate;
 /* -------------------- Macro definitions ---------------------------- */
 
 #ifdef DEBUG
-static void dumpVGAReg(void)
+static void dumpVGAReg(struct xgifb_video_info *xgifb_info)
 {
        u8 i, reg;
 
@@ -48,7 +48,7 @@ static void dumpVGAReg(void)
        }
 }
 #else
-static inline void dumpVGAReg(void)
+static inline void dumpVGAReg(struct xgifb_video_info *xgifb_info)
 {
 }
 #endif
@@ -1073,7 +1073,7 @@ static int XGIfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
        }
        XGIfb_bpp_to_var(xgifb_info, var); /*update ARGB info*/
 
-       dumpVGAReg();
+       dumpVGAReg(xgifb_info);
        return 0;
 }
 
@@ -2019,7 +2019,7 @@ static int xgifb_probe(struct pci_dev *pdev,
                goto error_mtrr;
        }
 
-       dumpVGAReg();
+       dumpVGAReg(xgifb_info);
 
        return 0;