* [PATCH 0/2] fbdev: ssd1307fb: fixes @ 2015-01-08 8:17 Lad, Prabhakar 2015-01-08 8:17 ` [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node Lad, Prabhakar 2015-01-08 8:17 ` [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset Lad, Prabhakar 0 siblings, 2 replies; 10+ messages in thread From: Lad, Prabhakar @ 2015-01-08 8:17 UTC (permalink / raw) To: LFBDEV, Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Maxime Ripard Cc: LKML, 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node 2015-01-08 8:17 [PATCH 0/2] fbdev: ssd1307fb: fixes Lad, Prabhakar @ 2015-01-08 8:17 ` Lad, Prabhakar 2015-01-08 9:31 ` Maxime Ripard 2015-01-15 11:27 ` Tomi Valkeinen 2015-01-08 8:17 ` [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset Lad, Prabhakar 1 sibling, 2 replies; 10+ messages in thread From: Lad, Prabhakar @ 2015-01-08 8:17 UTC (permalink / raw) To: LFBDEV, Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Maxime Ripard Cc: LKML, 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 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node 2015-01-08 8:17 ` [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node Lad, Prabhakar @ 2015-01-08 9:31 ` Maxime Ripard 2015-01-15 11:27 ` Tomi Valkeinen 1 sibling, 0 replies; 10+ messages in thread From: Maxime Ripard @ 2015-01-08 9:31 UTC (permalink / raw) To: Lad, Prabhakar Cc: LFBDEV, Jean-Christophe Plagniol-Villard, Tomi Valkeinen, LKML [-- Attachment #1: Type: text/plain, Size: 387 bytes --] 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 <maxime.ripard@free-electrons.com> Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node 2015-01-08 8:17 ` [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node Lad, Prabhakar 2015-01-08 9:31 ` Maxime Ripard @ 2015-01-15 11:27 ` Tomi Valkeinen 1 sibling, 0 replies; 10+ messages in thread From: Tomi Valkeinen @ 2015-01-15 11:27 UTC (permalink / raw) To: Lad, Prabhakar, LFBDEV, Jean-Christophe Plagniol-Villard, Maxime Ripard Cc: LKML [-- Attachment #1: Type: text/plain, Size: 849 bytes --] 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 [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset 2015-01-08 8:17 [PATCH 0/2] fbdev: ssd1307fb: fixes Lad, Prabhakar 2015-01-08 8:17 ` [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node Lad, Prabhakar @ 2015-01-08 8:17 ` Lad, Prabhakar 2015-01-08 9:32 ` Maxime Ripard 2015-01-13 11:43 ` Tomi Valkeinen 1 sibling, 2 replies; 10+ messages in thread From: Lad, Prabhakar @ 2015-01-08 8:17 UTC (permalink / raw) To: LFBDEV, Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Maxime Ripard Cc: LKML, 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 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset 2015-01-08 8:17 ` [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset Lad, Prabhakar @ 2015-01-08 9:32 ` Maxime Ripard 2015-01-13 11:43 ` Tomi Valkeinen 1 sibling, 0 replies; 10+ messages in thread From: Maxime Ripard @ 2015-01-08 9:32 UTC (permalink / raw) To: Lad, Prabhakar Cc: LFBDEV, Jean-Christophe Plagniol-Villard, Tomi Valkeinen, LKML [-- Attachment #1: Type: text/plain, Size: 417 bytes --] 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 <maxime.ripard@free-electrons.com> Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset 2015-01-08 8:17 ` [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset Lad, Prabhakar 2015-01-08 9:32 ` Maxime Ripard @ 2015-01-13 11:43 ` Tomi Valkeinen 2015-01-13 11:53 ` Prabhakar Lad 1 sibling, 1 reply; 10+ messages in thread From: Tomi Valkeinen @ 2015-01-13 11:43 UTC (permalink / raw) To: Lad, Prabhakar, LFBDEV, Jean-Christophe Plagniol-Villard, Maxime Ripard Cc: LKML [-- Attachment #1: Type: text/plain, Size: 1004 bytes --] 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 [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset 2015-01-13 11:43 ` Tomi Valkeinen @ 2015-01-13 11:53 ` Prabhakar Lad 2015-01-13 13:39 ` Maxime Ripard 0 siblings, 1 reply; 10+ messages in thread From: Prabhakar Lad @ 2015-01-13 11:53 UTC (permalink / raw) To: Tomi Valkeinen Cc: LFBDEV, Jean-Christophe Plagniol-Villard, Maxime Ripard, LKML On Tue, Jan 13, 2015 at 11:43 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > 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... > 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset 2015-01-13 11:53 ` Prabhakar Lad @ 2015-01-13 13:39 ` Maxime Ripard 2015-01-13 13:46 ` Prabhakar Lad 0 siblings, 1 reply; 10+ messages in thread From: Maxime Ripard @ 2015-01-13 13:39 UTC (permalink / raw) To: Prabhakar Lad Cc: Tomi Valkeinen, LFBDEV, Jean-Christophe Plagniol-Villard, LKML [-- Attachment #1: Type: text/plain, Size: 1626 bytes --] On Tue, Jan 13, 2015 at 11:53:01AM +0000, Prabhakar Lad wrote: > On Tue, Jan 13, 2015 at 11:43 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: > > 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... > > > 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 [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset 2015-01-13 13:39 ` Maxime Ripard @ 2015-01-13 13:46 ` Prabhakar Lad 0 siblings, 0 replies; 10+ messages in thread From: Prabhakar Lad @ 2015-01-13 13:46 UTC (permalink / raw) To: Maxime Ripard Cc: Tomi Valkeinen, LFBDEV, Jean-Christophe Plagniol-Villard, LKML On Tue, Jan 13, 2015 at 1:39 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Tue, Jan 13, 2015 at 11:53:01AM +0000, Prabhakar Lad wrote: >> On Tue, Jan 13, 2015 at 11:43 AM, Tomi Valkeinen <tomi.valkeinen@ti.com> wrote: >> > 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... >> > >> 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 ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-01-15 11:27 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-01-08 8:17 [PATCH 0/2] fbdev: ssd1307fb: fixes Lad, Prabhakar 2015-01-08 8:17 ` [PATCH 1/2] fbdev: ssd1307fb: set default height if not found in DT node Lad, Prabhakar 2015-01-08 9:31 ` Maxime Ripard 2015-01-15 11:27 ` Tomi Valkeinen 2015-01-08 8:17 ` [PATCH 2/2] fbdev: ssd1307fb: check return value while setting offset Lad, Prabhakar 2015-01-08 9:32 ` Maxime Ripard 2015-01-13 11:43 ` Tomi Valkeinen 2015-01-13 11:53 ` Prabhakar Lad 2015-01-13 13:39 ` Maxime Ripard 2015-01-13 13:46 ` Prabhakar Lad
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).