---

yaml --- r: 186628 b: refs/heads/master c: 0df28be h: refs/heads/master v: v3
git-mirror · Mar 4, 2010 · 2cce510 · 2cce510
1 parent 81364e6
commit 2cce510
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c424d46fdc79df201707fe815aa8480751918025
+refs/heads/master: 0df28be06e08b9a53c26a53974bf3afea4928b3e
diff --git a/trunk/drivers/staging/asus_oled/asus_oled.c b/trunk/drivers/staging/asus_oled/asus_oled.c
@@ -430,6 +430,11 @@ static ssize_t odev_set_picture(struct asus_oled_dev *odev,
 
 		kfree(odev->buf);
 		odev->buf = kmalloc(odev->buf_size, GFP_KERNEL);
+		if (odev->buf == NULL) {
+			odev->buf_size = 0;
+			printk(ASUS_OLED_ERROR "Out of memory!\n");
+			return -ENOMEM;
+		}
 
 		memset(odev->buf, 0xff, odev->buf_size);