Started by Lad, Prabhakar on Jan 8, 2015 · 10 messages from 3 authors · Last reply Jan 15, 2015
2 patches, 1 file
+2 −2
open the first message on its own page
L Lad, Prabhakar #
This patch series fixes trivial issues in ssd1307fb driver. Lad, Prabhakar (2): fbdev: ssd1307fb: set default height if not found in DT node fbdev: ssd1307fb: check return value while setting offset drivers/video/fbdev/ssd1307fb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1
L Lad, Prabhakar replied to Lad, Prabhakar #
this patch sets the default height if its not found in DT. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- 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 f4daa59..70e3ce8 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c@@ -460,7 +460,7 @@ static int ssd1307fb_probe(struct i2c_client *client, par->width = 96; if (of_property_read_u32(node, "solomon,height", &par->height)) - par->width = 16; + par->height = 16; if (of_property_read_u32(node, "solomon,page-offset", &par->page_offset)) par->page_offset = 1;
--
1.9.1
L Lad, Prabhakar replied to Lad, Prabhakar #
this patch checks the return value of write command while
setting the display offset.
Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
---
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 70e3ce8..a7ecaa6 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c@@ -342,7 +342,7 @@ static int ssd1307fb_ssd1306_init(struct ssd1307fb_par *par) /* set display offset value */ ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_DISPLAY_OFFSET); - ret = ssd1307fb_write_cmd(par->client, 0x20); + ret = ret & ssd1307fb_write_cmd(par->client, 0x20); if (ret < 0) return ret;
--
1.9.1
M Maxime Ripard replied to Lad, Prabhakar #
On Thu, Jan 08, 2015 at 08:17:58AM +0000, Lad, Prabhakar wrote:
this patch sets the default height if its not found in DT. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Maxime Ripard <redacted> Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
M Maxime Ripard replied to Lad, Prabhakar #
On Thu, Jan 08, 2015 at 08:17:59AM +0000, Lad, Prabhakar wrote:
this patch checks the return value of write command while setting the display offset. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: Maxime Ripard <redacted> Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
T Tomi Valkeinen replied to Lad, Prabhakar #
On 08/01/15 10:17, Lad, Prabhakar wrote:
this patch checks the return value of write command while setting the display offset. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- 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 70e3ce8..a7ecaa6 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c@@ -342,7 +342,7 @@ static int ssd1307fb_ssd1306_init(struct ssd1307fb_par *par) /* set display offset value */ ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_DISPLAY_OFFSET); - ret = ssd1307fb_write_cmd(par->client, 0x20); + ret = ret & ssd1307fb_write_cmd(par->client, 0x20); if (ret < 0) return ret;
Hrm, what's that supposed to do? If both calls to ssd1307fb_write_cmd()
return an error, they are anded, resulting in a garbage error code...
Tomi
P Prabhakar Lad replied to Tomi Valkeinen #
On Tue, Jan 13, 2015 at 11:43 AM, Tomi Valkeinen [off-list ref] wrote:
On 08/01/15 10:17, Lad, Prabhakar wrote:quoted
this patch checks the return value of write command while setting the display offset. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- 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 70e3ce8..a7ecaa6 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c@@ -342,7 +342,7 @@ static int ssd1307fb_ssd1306_init(struct ssd1307fb_par *par) /* set display offset value */ ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_DISPLAY_OFFSET); - ret = ssd1307fb_write_cmd(par->client, 0x20); + ret = ret & ssd1307fb_write_cmd(par->client, 0x20); if (ret < 0) return ret;Hrm, what's that supposed to do? If both calls to ssd1307fb_write_cmd() return an error, they are anded, resulting in a garbage error code...
Agreed I have just aligned this to rest of the code in this function. Maxime if you are OK I'll post a patch returning error then and there ? Thanks, --Prabhakar Lad
M Maxime Ripard replied to Prabhakar Lad #
On Tue, Jan 13, 2015 at 11:53:01AM +0000, Prabhakar Lad wrote:
On Tue, Jan 13, 2015 at 11:43 AM, Tomi Valkeinen [off-list ref] wrote:quoted
On 08/01/15 10:17, Lad, Prabhakar wrote:quoted
this patch checks the return value of write command while setting the display offset. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- 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 70e3ce8..a7ecaa6 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c@@ -342,7 +342,7 @@ static int ssd1307fb_ssd1306_init(struct ssd1307fb_par *par) /* set display offset value */ ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_DISPLAY_OFFSET); - ret = ssd1307fb_write_cmd(par->client, 0x20); + ret = ret & ssd1307fb_write_cmd(par->client, 0x20); if (ret < 0) return ret;Hrm, what's that supposed to do? If both calls to ssd1307fb_write_cmd() return an error, they are anded, resulting in a garbage error code...Agreed I have just aligned this to rest of the code in this function. Maxime if you are OK I'll post a patch returning error then and there ?
I'm not sure what the question is, but Tomi is right, having two returns seems the right thing to do. Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
P Prabhakar Lad replied to Maxime Ripard #
On Tue, Jan 13, 2015 at 1:39 PM, Maxime Ripard [off-list ref] wrote:
On Tue, Jan 13, 2015 at 11:53:01AM +0000, Prabhakar Lad wrote:quoted
On Tue, Jan 13, 2015 at 11:43 AM, Tomi Valkeinen [off-list ref] wrote:quoted
On 08/01/15 10:17, Lad, Prabhakar wrote:quoted
this patch checks the return value of write command while setting the display offset. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- 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 70e3ce8..a7ecaa6 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c@@ -342,7 +342,7 @@ static int ssd1307fb_ssd1306_init(struct ssd1307fb_par *par) /* set display offset value */ ret = ssd1307fb_write_cmd(par->client, SSD1307FB_SET_DISPLAY_OFFSET); - ret = ssd1307fb_write_cmd(par->client, 0x20); + ret = ret & ssd1307fb_write_cmd(par->client, 0x20); if (ret < 0) return ret;Hrm, what's that supposed to do? If both calls to ssd1307fb_write_cmd() return an error, they are anded, resulting in a garbage error code...Agreed I have just aligned this to rest of the code in this function. Maxime if you are OK I'll post a patch returning error then and there ?I'm not sure what the question is, but Tomi is right, having two returns seems the right thing to do.
OK I'll post a new patch having two separate returns. Thanks, --Prabhakar Lad
T Tomi Valkeinen replied to Lad, Prabhakar #
On 08/01/15 10:17, Lad, Prabhakar wrote:
this patch sets the default height if its not found in DT. Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> --- 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 f4daa59..70e3ce8 100644 --- a/drivers/video/fbdev/ssd1307fb.c +++ b/drivers/video/fbdev/ssd1307fb.c@@ -460,7 +460,7 @@ static int ssd1307fb_probe(struct i2c_client *client, par->width = 96; if (of_property_read_u32(node, "solomon,height", &par->height)) - par->width = 16; + par->height = 16; if (of_property_read_u32(node, "solomon,page-offset", &par->page_offset)) par->page_offset = 1;
Thanks, queued for 3.20. Tomi