From 4bbeebd8e2bf9a14af675e17feb8cd4c1d2d5c79 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 17 Feb 2012 09:45:01 +0300
Subject: [PATCH] --- yaml --- r: 294287 b: refs/heads/master c:
 c572c8bbff13591f6c9f249d4413f79ddda21e61 h: refs/heads/master i:   294285:
 34304ec87dee49af1d8f5c20286ec3f8ca0b370f   294283:
 fe154ceebca982d317dd3bc3ee6f79dc63206abe   294279:
 a9d6c7ab46fa21832ba0148ab9d904034128ca19   294271:
 5676b3efe97067a5c9d35fce1402617e76a07946 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/video/via/via_aux_edid.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4c66d59f1f5e..38186658a823 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b918120489ea004388b7370194222671e657203
+refs/heads/master: c572c8bbff13591f6c9f249d4413f79ddda21e61
diff --git a/trunk/drivers/video/via/via_aux_edid.c b/trunk/drivers/video/via/via_aux_edid.c
index 03f7a41c8a3f..754d4509033f 100644
--- a/trunk/drivers/video/via/via_aux_edid.c
+++ b/trunk/drivers/video/via/via_aux_edid.c
@@ -36,10 +36,13 @@ static void query_edid(struct via_aux_drv *drv)
 	unsigned char edid[EDID_LENGTH];
 	bool valid = false;
 
-	if (spec)
+	if (spec) {
 		fb_destroy_modedb(spec->modedb);
-	else
+	} else {
 		spec = kmalloc(sizeof(*spec), GFP_KERNEL);
+		if (!spec)
+			return;
+	}
 
 	spec->version = spec->revision = 0;
 	if (via_aux_read(drv, 0x00, edid, EDID_LENGTH)) {