]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit4b00e4b3940eabb38adeec0823751820fe2d6fda
tree471cedd0c3ada2daa138c9363277a6ce7620909e
parent6f76b6fcaa6025bc9b2c00e055c7ccd39730568d
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>
drivers/video/savage/savagefb.h