From 2cce51066bbc1cb4b5fe313fbd1415e0a42397fd Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Thu, 7 Jan 2010 19:57:36 +0100
Subject: [PATCH] --- yaml --- r: 186628 b: refs/heads/master c:
 0df28be06e08b9a53c26a53974bf3afea4928b3e h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/asus_oled/asus_oled.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4f3a68a7d843..a19c75fc7823 100644
--- 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
index 0c1fb0d618a5..c597fb27bd53 100644
--- 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);