Skip to content

Commit

Permalink
savagedb: Fix typo causing regression in savage4 series video chip de…
Browse files Browse the repository at this point in the history 
…tection

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 <[email protected]>
Reviewed-by: Tormod Volden <[email protected]>
[ The macros have incomplete parenthesis too, but whatever ..  -Linus ]
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
@jpsinthemix @torvalds
jpsinthemix authored and torvalds committed Aug 6, 2011
1 parent 6f76b6f commit 4b00e4b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/video/savage/savagefb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down

0 comments on commit 4b00e4b

Please sign in to comment.