aboutsummaryrefslogtreecommitdiff
path: root/x11-drivers/xf86-video-sis/files/patch-src_init301.c
blob: 1bb38e93e8f2eb61aafd4cd9c3df9c7063e3e972 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
# Fix an uninitialized variable
# Remove some dead code to eliminate a style warning
#
--- src/init301.c.orig	2010-03-07 19:36:10 UTC
+++ src/init301.c
@@ -446,7 +446,7 @@ SiS_CR36BIOSWord23d(struct SiS_Private *
 void
 SiS_DDC2Delay(struct SiS_Private *SiS_Pr, unsigned int delaytime)
 {
-   unsigned int i, j;
+   unsigned int i, j = 0;
 
    for(i = 0; i < delaytime; i++) {
       j += SiS_GetReg(SiS_Pr->SiS_P3c4,0x05);
@@ -534,9 +534,7 @@ SiS_PanelDelay(struct SiS_Private *SiS_P
 	    SiS_DDC2Delay(SiS_Pr, 0x4000);
 	 }
 
-      } else if((SiS_Pr->SiS_IF_DEF_LVDS == 1) /* ||
-	 (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) ||
-	 (SiS_Pr->SiS_CustomT == CUT_CLEVO1400) */ ) {			/* 315 series, LVDS; Special */
+      } else if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {				/* 315 series, LVDS; Special */
 
 	 if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
 	    PanelID = SiS_GetReg(SiS_Pr->SiS_P3d4,0x36);