---

yaml --- r: 294287 b: refs/heads/master c: c572c8b h: refs/heads/master i: 294285: 34304ec 294283: fe154ce 294279: a9d6c7a 294271: 5676b3e v: v3
git-mirror · Feb 17, 2012 · 4bbeebd · 4bbeebd
1 parent 5383528
commit 4bbeebd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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)) {