2003-06-17 23:13:34

by Adrian Bunk

[permalink] [raw]
Subject: [2.5 patch] fix for drivers/video/sis/init301.c

Hi James,

the following patch fixes some nonsense in drivers/video/sis/init301.c .
I've tested the compilation with 2.5.72.

--- linux-2.5.72/drivers/video/sis/init301.c.old 2003-06-18 01:22:27.000000000 +0200
+++ linux-2.5.72/drivers/video/sis/init301.c 2003-06-18 01:23:23.000000000 +0200
@@ -5282,7 +5282,7 @@
#ifdef SIS315H /* 310/325 series */

if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
- temp = temp = SiS_GetCH701x(SiS_Pr,0x61);
+ temp = SiS_GetCH701x(SiS_Pr,0x61);
if(temp < 1) {
SiS_SetCH701x(SiS_Pr,0xac76);
SiS_SetCH701x(SiS_Pr,0x0066);



Please apply
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed


2003-06-18 15:45:07

by Thomas Winischhofer

[permalink] [raw]
Subject: Re: [2.5 patch] fix for drivers/video/sis/init301.c


James has a much newer version of sisfb in his fbdev tree, waiting to be
included in the main line.

Thomas

--
Thomas Winischhofer
Vienna/Austria
thomas AT winischhofer DOT net *** http://www.winischhofer.net/
twini AT xfree86 DOT org



2003-06-19 04:56:10

by James Simmons

[permalink] [raw]
Subject: Re: [2.5 patch] fix for drivers/video/sis/init301.c


Already fixed in the newer driver.


On Wed, 18 Jun 2003, Adrian Bunk wrote:

> Hi James,
>
> the following patch fixes some nonsense in drivers/video/sis/init301.c .
> I've tested the compilation with 2.5.72.
>
> --- linux-2.5.72/drivers/video/sis/init301.c.old 2003-06-18 01:22:27.000000000 +0200
> +++ linux-2.5.72/drivers/video/sis/init301.c 2003-06-18 01:23:23.000000000 +0200
> @@ -5282,7 +5282,7 @@
> #ifdef SIS315H /* 310/325 series */
>
> if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
> - temp = temp = SiS_GetCH701x(SiS_Pr,0x61);
> + temp = SiS_GetCH701x(SiS_Pr,0x61);
> if(temp < 1) {
> SiS_SetCH701x(SiS_Pr,0xac76);
> SiS_SetCH701x(SiS_Pr,0x0066);
>
>
>
> Please apply
> Adrian
>
>