summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.csengg@gmail.com>2015-01-08 08:17:58 +0000
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-01-15 13:25:28 +0200
commit9561def0411bb810b6d3a53c15b03bfef4b1e2ab (patch)
treea4479f33fddbf0028bfda88c9a0cf5fb1f969a33 /drivers/video
parentf6535d21e388a3f543fadfabab65e0eda413b2b2 (diff)
downloadop-kernel-dev-9561def0411bb810b6d3a53c15b03bfef4b1e2ab.zip
op-kernel-dev-9561def0411bb810b6d3a53c15b03bfef4b1e2ab.tar.gz
fbdev: ssd1307fb: set default height if not found in DT node
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> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/ssd1307fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 31d845b..3d6611f 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -443,7 +443,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;
OpenPOWER on IntegriCloud