From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/video/fbdev/sis: Add missing else
Date: Mon, 23 Jun 2014 12:07:21 +0000 [thread overview]
Message-ID: <53A81879.6000303@ti.com> (raw)
In-Reply-To: <1403294397-18262-1-git-send-email-linux@rasmusvillemoes.dk>
[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]
On 20/06/14 22:59, Rasmus Villemoes wrote:
> 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>
> ---
> 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 {
>
I agree. Queued for 3.17.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: <linux-fbdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] drivers/video/fbdev/sis: Add missing else
Date: Mon, 23 Jun 2014 15:07:21 +0300 [thread overview]
Message-ID: <53A81879.6000303@ti.com> (raw)
In-Reply-To: <1403294397-18262-1-git-send-email-linux@rasmusvillemoes.dk>
[-- Attachment #1: Type: text/plain, Size: 1040 bytes --]
On 20/06/14 22:59, Rasmus Villemoes wrote:
> 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>
> ---
> 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 {
>
I agree. Queued for 3.17.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2014-06-23 12:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-20 19:59 [PATCH] drivers/video/fbdev/sis: Add missing else Rasmus Villemoes
2014-06-20 19:59 ` Rasmus Villemoes
2014-06-23 12:07 ` Tomi Valkeinen [this message]
2014-06-23 12:07 ` Tomi Valkeinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53A81879.6000303@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
--cc=plagnioj@jcrosoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.