From 9d18aff8b3a55a67c9c68fae17a514a91fb3fd67 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Fri, 21 Sep 2012 12:55:02 +0800
Subject: [PATCH] --- yaml --- r: 332961 b: refs/heads/master c:
 91312c53aff4c9863dca6080182091dc5c5824c6 h: refs/heads/master i:   332959:
 a8a040cd6ebb025c554ba8097d4eb78ca698436e v: v3

---
 [refs]                 | 2 +-
 trunk/fs/hppfs/hppfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9169c356cddb..5b249c3e336e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3be2be0a32c18b0fd6d623cda63174a332ca0de1
+refs/heads/master: 91312c53aff4c9863dca6080182091dc5c5824c6
diff --git a/trunk/fs/hppfs/hppfs.c b/trunk/fs/hppfs/hppfs.c
index a68cb2092512..78f21f8dc2ec 100644
--- a/trunk/fs/hppfs/hppfs.c
+++ b/trunk/fs/hppfs/hppfs.c
@@ -674,7 +674,7 @@ static struct inode *get_inode(struct super_block *sb, struct dentry *dentry)
 
 	if (!inode) {
 		dput(dentry);
-		return ERR_PTR(-ENOMEM);
+		return NULL;
 	}
 
 	if (S_ISDIR(dentry->d_inode->i_mode)) {