diff options
| author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2014-06-20 21:59:57 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-07-01 12:32:31 +0200 |
| commit | 621f58cc3a10c4a5d8e1129b7d9bbc4a9ee3383a (patch) | |
| tree | 9600caafd11da1c694e09c716ffb0d5bef7bb53a /drivers/video | |
| parent | fbdev: da8xx-fb: Use dma_zalloc_coherent (diff) | |
| download | linux-621f58cc3a10c4a5d8e1129b7d9bbc4a9ee3383a.tar.xz linux-621f58cc3a10c4a5d8e1129b7d9bbc4a9ee3383a.zip | |
drivers/video/fbdev/sis: Add missing else
The surrounding code and the fact that the previous two if's are
rendered useless without this "else" (since SIS_340==55 and XGI_20==75
are greater than SIS_661==15) suggests that the "else" is indeed
missing.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/sis/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c index bd40f5ecd901..dfe3eb769638 100644 --- a/drivers/video/fbdev/sis/init.c +++ b/drivers/video/fbdev/sis/init.c @@ -1511,7 +1511,7 @@ SiS_Get310DRAMType(struct SiS_Private *SiS_Pr) } else if(SiS_Pr->ChipType >= SIS_340) { /* TODO */ data = 0; - } if(SiS_Pr->ChipType >= SIS_661) { + } else if(SiS_Pr->ChipType >= SIS_661) { if(SiS_Pr->SiS_ROMNew) { data = ((SiS_GetReg(SiS_Pr->SiS_P3d4,0x78) & 0xc0) >> 6); } else { |