From db22ffeee28a460a0cdd9b74bce6349fc260afd9 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 20 Jan 2012 07:55:30 -0500
Subject: [PATCH] --- yaml --- r: 323251 b: refs/heads/master c:
 22fff826e715e9727d3c7a69f15e602a9801b673 h: refs/heads/master i:   323249:
 6dcdc40eefd445722e67f9ee72be0c3d7a846930   323247:
 ba018fd1a5ffc23a1dfeca182967659533de3180 v: v3

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

diff --git a/[refs] b/[refs]
index 9545367a2de5..9289c02f8776 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7d36ab8fa04c213328119a9c0d66985fe204ee5
+refs/heads/master: 22fff826e715e9727d3c7a69f15e602a9801b673
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 6c0eb768562f..064e86a6bb4e 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/drivers/block/nvme.c
@@ -1044,6 +1044,8 @@ static struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write,
 	offset = offset_in_page(addr);
 	count = DIV_ROUND_UP(offset + length, PAGE_SIZE);
 	pages = kcalloc(count, sizeof(*pages), GFP_KERNEL);
+	if (!pages)
+		return ERR_PTR(-ENOMEM);
 
 	err = get_user_pages_fast(addr, count, 1, pages);
 	if (err < count) {