aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.csengg@gmail.com>2015-01-08 03:17:58 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-01-15 06:25:28 -0500
commit9561def0411bb810b6d3a53c15b03bfef4b1e2ab (patch)
treea4479f33fddbf0028bfda88c9a0cf5fb1f969a33
parentf6535d21e388a3f543fadfabab65e0eda413b2b2 (diff)
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>
-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 31d845bf79a8..3d6611f1958f 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,
443 par->width = 96; 443 par->width = 96;
444 444
445 if (of_property_read_u32(node, "solomon,height", &par->height)) 445 if (of_property_read_u32(node, "solomon,height", &par->height))
446 par->width = 16; 446 par->height = 16;
447 447
448 if (of_property_read_u32(node, "solomon,page-offset", &par->page_offset)) 448 if (of_property_read_u32(node, "solomon,page-offset", &par->page_offset))
449 par->page_offset = 1; 449 par->page_offset = 1;