Commit 4b00e4b3 authored Aug 03, 2011 by John Stanley Committed by Linus Torvalds Aug 06, 2011

savagedb: Fix typo causing regression in savage4 series video chip detection



Two additional savage4 variants were added, but the S3_SAVAGE4_SERIES
macro was incompletely modified, resulting in a false positive detection
of a savage4 card regardless of which savage card is actually present.

For non-savage4 series cards, such as a Savage/IX-MV card, this results
in garbled video and/or a hard-hang at boot time.  Fix this by changing
an '||' to an '&&' in the S3_SAVAGE4_SERIES macro.

Signed-off-by: John P. Stanley <jpsinthemix@verizon.net>
Reviewed-by: Tormod Volden <debian.tormod@gmail.com>
[ The macros have incomplete parenthesis too, but whatever ..  -Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6f76b6fc

drivers/video/savage/savagefb.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@

		#define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))

		#define S3_SAVAGE4_SERIES(chip) ((chip>=S3_SAVAGE4) \|\| (chip<=S3_PROSAVAGEDDR))
		#define S3_SAVAGE4_SERIES(chip) ((chip>=S3_SAVAGE4) && (chip<=S3_PROSAVAGEDDR))

		#define S3_SAVAGE_MOBILE_SERIES(chip) ((chip==S3_SAVAGE_MX) \|\| (chip==S3_SUPERSAVAGE))