diff --git a/[refs] b/[refs]
index 28f5680fb8e2..889a53a7c0e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 015f0212d51d85bd281a831639a769b4a1a3307a
+refs/heads/master: 8f0d97b41523fb85a2d230f6794121e5834f0cf9
diff --git a/trunk/fs/nfs/idmap.c b/trunk/fs/nfs/idmap.c
index dec47ed8b6b9..4e2d9b6b1380 100644
--- a/trunk/fs/nfs/idmap.c
+++ b/trunk/fs/nfs/idmap.c
@@ -123,7 +123,7 @@ static ssize_t nfs_idmap_get_desc(const char *name, size_t namelen,
 	size_t desclen = typelen + namelen + 2;
 
 	*desc = kmalloc(desclen, GFP_KERNEL);
-	if (!desc)
+	if (!*desc)
 		return -ENOMEM;
 
 	cp = *desc;