From 910b194e9177c22539053e6827eb23126e469f20 Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Mon, 30 Jul 2012 14:43:24 -0700
Subject: [PATCH] --- yaml --- r: 319997 b: refs/heads/master c:
 086ff4b3a7fb9cdf41e6a5d0ccd99b86d84633a1 h: refs/heads/master i:   319995:
 87de42c33f7b06e6b839b64238b6a7c614ecaf91 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/misc/lkdtm.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4ad0504487a3..c1880e2165c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e04f228335bde305d2833e40382ed37fc36f9efe
+refs/heads/master: 086ff4b3a7fb9cdf41e6a5d0ccd99b86d84633a1
diff --git a/trunk/drivers/misc/lkdtm.c b/trunk/drivers/misc/lkdtm.c
index 28adefe70f96..08aad69c8da4 100644
--- a/trunk/drivers/misc/lkdtm.c
+++ b/trunk/drivers/misc/lkdtm.c
@@ -477,6 +477,8 @@ static ssize_t lkdtm_debugfs_read(struct file *f, char __user *user_buf,
 	int i, n, out;
 
 	buf = (char *)__get_free_page(GFP_KERNEL);
+	if (buf == NULL)
+		return -ENOMEM;
 
 	n = snprintf(buf, PAGE_SIZE, "Available crash types:\n");
 	for (i = 0; i < ARRAY_SIZE(cp_type); i++)