]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
savagedb: Fix typo causing regression in savage4 series video chip detection
authorJohn Stanley <jpsinthemix@verizon.net>
Thu, 4 Aug 2011 00:41:00 +0000 (20:41 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Aug 2011 19:02:40 +0000 (12:02 -0700)
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>
drivers/video/savage/savagefb.h

index 32549d177b198ae2f7f2b9a738d6b8a0cb9de049..dcaab9012ca20564dacbe33c6d00b305869252b2 100644 (file)
@@ -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))