staging: xgifb: XGIfb_mode_rate_to_ddata: initialize ModeIdIndex properly

Initialize ModeIdIndex according to the selected video mode. Currently
index 0 is always used and wrong video mode data may be used.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index c703b83a4eab0804914c3b88a5482d4f6d4299f2..67323b1d1b3cf6b41fd3aa6e49776e06b66ef90a 100644 (file)
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -190,7 +190,7 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
                u32 *vmode)
 {
        unsigned short ModeNo = modeno;
-       unsigned short ModeIdIndex = 0, index = 0;
+       unsigned short ModeIdIndex, index = 0;
        unsigned short RefreshRateTableIndex = 0;
 
        unsigned short VRE, VBE, VRS, VBS, VDE, VT;
@@ -199,6 +199,8 @@ static int XGIfb_mode_rate_to_ddata(struct vb_device_info *XGI_Pr,
        unsigned long cr_data3;
        int A, B, C, D, E, F, temp, j;
        InitTo330Pointer(HwDeviceExtension->jChipType, XGI_Pr);
+       if (!XGI_SearchModeID(ModeNo, &ModeIdIndex, XGI_Pr))
+               return 0;
        RefreshRateTableIndex = XGI_GetRatePtrCRT2(HwDeviceExtension, ModeNo,
                        ModeIdIndex, XGI_Pr);
        index = XGI_Pr->RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;