2015-05-25 19:25:09

by Thomas Niederprüm

[permalink] [raw]
Subject: [PATCH] fbdev: ssd1307fb: fix logical error

The logical not needs to be done after the bit masking.

Fixes: a3998fe03e87 ("fbdev: ssd1307fb: Unify init code and obtain
hw specific bits from DT")

Signed-off-by: Thomas Niederprüm <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
---
drivers/video/fbdev/ssd1307fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 8fc224c..9771d56 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -368,7 +368,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
if (ret < 0)
return ret;

- compins = 0x02 | (!par->com_seq & 0x1) << 4
+ compins = 0x02 | !(par->com_seq & 0x1) << 4
| (par->com_lrremap & 0x1) << 5;
ret = ssd1307fb_write_cmd(par->client, compins);
if (ret < 0)
--
2.3.0


2015-05-26 07:03:16

by Tomi Valkeinen

[permalink] [raw]
Subject: Re: [PATCH] fbdev: ssd1307fb: fix logical error



On 25/05/15 22:29, Thomas Niederprüm wrote:
> The logical not needs to be done after the bit masking.
>
> Fixes: a3998fe03e87 ("fbdev: ssd1307fb: Unify init code and obtain
> hw specific bits from DT")
>
> Signed-off-by: Thomas Niederprüm <[email protected]>
> Reported-by: Dan Carpenter <[email protected]>
> ---
> drivers/video/fbdev/ssd1307fb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
> index 8fc224c..9771d56 100644
> --- a/drivers/video/fbdev/ssd1307fb.c
> +++ b/drivers/video/fbdev/ssd1307fb.c
> @@ -368,7 +368,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
> if (ret < 0)
> return ret;
>
> - compins = 0x02 | (!par->com_seq & 0x1) << 4
> + compins = 0x02 | !(par->com_seq & 0x1) << 4
> | (par->com_lrremap & 0x1) << 5;
> ret = ssd1307fb_write_cmd(par->client, compins);
> if (ret < 0)
>

Thanks, queued for 4.2.

Tomi


Attachments:
signature.asc (819.00 B)
OpenPGP digital signature