Commit 5a3a3f64 authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/xgifb: fix dumpVGAReg compile error if DEBUG is set 



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: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bc8ff74

drivers/staging/xgifb/XGI_main_26.c

+4 −4
Original line number Diff line number Diff line
@@ -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;