From 13d10723afbefa2c4ab540a5c662e083c9b1de11 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Thu, 13 Dec 2012 12:13:51 +0200
Subject: [PATCH] --- yaml --- r: 344699 b: refs/heads/master c:
 fa0c5e71295fa4d62b900818d900c16980985e72 h: refs/heads/master i:   344697:
 4af9ffee72ba3bc37af7673d20fa5affac67cf6d   344695:
 da95672c29b65a7c3e5ac5b1ee09bbf573abc989 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/video/omap2/omapfb/omapfb-main.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3985918cb151..d0269619f58f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 057eeaee6803dafbbf2f79345643530e731ba7cb
+refs/heads/master: fa0c5e71295fa4d62b900818d900c16980985e72
diff --git a/trunk/drivers/video/omap2/omapfb/omapfb-main.c b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
index 477a20817d08..948dfb9f3e9b 100644
--- a/trunk/drivers/video/omap2/omapfb/omapfb-main.c
+++ b/trunk/drivers/video/omap2/omapfb/omapfb-main.c
@@ -2241,12 +2241,18 @@ static int omapfb_find_best_mode(struct omap_dss_device *display,
 
 	len = 0x80 * 2;
 	edid = kmalloc(len, GFP_KERNEL);
+	if (edid == NULL)
+		return -ENOMEM;
 
 	r = display->driver->read_edid(display, edid, len);
 	if (r < 0)
 		goto err1;
 
 	specs = kzalloc(sizeof(*specs), GFP_KERNEL);
+	if (specs == NULL) {
+		r = -ENOMEM;
+		goto err1;
+	}
 
 	fb_edid_to_monspecs(edid, specs);