diff --git a/[refs] b/[refs]
index 6d9a99a82c42..d5c3940ef05d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fd74e25df46ecb0b54700aba242dcaeb2d75f4a
+refs/heads/master: cccad8f9f0f1be585c9dc534857ca9c67e538836
diff --git a/trunk/fs/affs/namei.c b/trunk/fs/affs/namei.c
index d70bbbac6b7b..914d1c0bc07a 100644
--- a/trunk/fs/affs/namei.c
+++ b/trunk/fs/affs/namei.c
@@ -224,7 +224,7 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
 		affs_brelse(bh);
 		inode = affs_iget(sb, ino);
 		if (IS_ERR(inode))
-			return ERR_PTR(PTR_ERR(inode));
+			return ERR_CAST(inode);
 	}
 	dentry->d_op = AFFS_SB(sb)->s_flags & SF_INTL ? &affs_intl_dentry_operations : &affs_dentry_operations;
 	d_add(dentry, inode);