From: Antoine Ténart <antoine.ten...@free-electrons.com>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit 7d3477d801808a5037a511cf5a5aae5718e7ecce upstream.

If no driver takeover the atmel_lcdfb, the lcd won't be in a working state
since atmel_lcdfb_set_par() will never be called. Enabling a driver which does,
like fbcon, will call the function and put atmel_lcdfb in a working state.

Fixes: b985172b328a (video: atmel_lcdfb: add device tree suport)

Signed-off-by: Antoine Ténart <antoine.ten...@free-electrons.com>
Reported-by: Alexandre Belloni <alexandre.bell...@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.bell...@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.fe...@atmel.com>
Signed-off-by: Tomi Valkeinen <tomi.valkei...@ti.com>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
 drivers/video/atmel_lcdfb.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 088511a58a26..0aca4e6b2871 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1081,6 +1081,12 @@ static int __init atmel_lcdfb_probe(struct 
platform_device *pdev)
                goto free_cmap;
        }
 
+       ret = atmel_lcdfb_set_par(info);
+       if (ret < 0) {
+               dev_err(dev, "set par failed: %d\n", ret);
+               goto unregister_irqs;
+       }
+
        dev_set_drvdata(dev, info);
 
        /*
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to