From patchwork Fri Jun 20 19:59:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 4392281 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D1EC99F1D6 for ; Fri, 20 Jun 2014 20:00:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BF3C203DA for ; Fri, 20 Jun 2014 20:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35160202EB for ; Fri, 20 Jun 2014 20:00:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933903AbaFTUAX (ORCPT ); Fri, 20 Jun 2014 16:00:23 -0400 Received: from mail-la0-f53.google.com ([209.85.215.53]:44075 "EHLO mail-la0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757161AbaFTUAW (ORCPT ); Fri, 20 Jun 2014 16:00:22 -0400 Received: by mail-la0-f53.google.com with SMTP id b8so2637103lan.40 for ; Fri, 20 Jun 2014 13:00:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=iTVf86FP+2qF1ufTolaAWbDewPXkI9p5eXFJ4A1q0pA=; b=WlGdLOLUrkQzGZI5yfh/JgrMBtAUVh+bUTRKt4amiClJf2GsuId127rxVxWSDPeCeA 0yeH6za91opz0kHQHmD4LmwHeEHolcpLYbfAJ6JkkP/ATT1yCj0kHcaOcfTexYsRYlyW +XN4m/6pB8lzEItfLrhMPTJsmHe9sNJywFAAIlDJ3xghzKltBehU/sShIgsaQeKBeJf9 NGWmxmWN4T4hngLK4UHrpPj7UjQ458xAI0CMq7RFd02yxso+xN6OUolrSVrOAXfIxB5s 2T5FlI4JUzyVDE5H+THDJ7BojwU99icgcbuxOqutOTgb6wqDKeXPhH5A/SQT2DaU0mmi OBxg== X-Gm-Message-State: ALoCoQm6SbbdSS1gvVXYLtWw0O2NGIuzaIDRN3uYpn98YgCkL6DgtEfCwL91Tv5XTrKEPuYdTizs X-Received: by 10.112.41.72 with SMTP id d8mr3067102lbl.63.1403294420302; Fri, 20 Jun 2014 13:00:20 -0700 (PDT) Received: from spencer.imf.au.dk ([130.225.20.51]) by mx.google.com with ESMTPSA id qx6sm7226254lbb.23.2014.06.20.13.00.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Jun 2014 13:00:19 -0700 (PDT) From: Rasmus Villemoes To: Jean-Christophe Plagniol-Villard , Tomi Valkeinen Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, Rasmus Villemoes Subject: [PATCH] drivers/video/fbdev/sis: Add missing else Date: Fri, 20 Jun 2014 21:59:57 +0200 Message-Id: <1403294397-18262-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 1.7.10.4 Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/video/fbdev/sis/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c index bd40f5e..dfe3eb7 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 {