X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_vfs.c;h=b1b6840939de4426e808a56ef4e9f16cdc54d3a5;hp=371ddd1dc9a4d29a8beabe43d052a66e9309a011;hb=96eaf1d7ebcad5892d7600bf85419f70d332f8b2;hpb=a5bab2056ca3c68d3e15568f81a6e1d697d23da5

diff --git a/yaffs_vfs.c b/yaffs_vfs.c
index 371ddd1..b1b6840 100644
--- a/yaffs_vfs.c
+++ b/yaffs_vfs.c
@@ -512,7 +512,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
 static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
 	unsigned char *alias;
-	int ret;
+	void *ret;
 	yaffs_dev_t *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
 	yaffs_gross_lock(dev);
@@ -521,14 +521,14 @@ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
 	yaffs_gross_unlock(dev);
 
 	if (!alias) {
-		ret = -ENOMEM;
+		ret = ERR_PTR(-ENOMEM);
 		goto out;
 	}
 
 	nd_set_link(nd, alias);
-	ret = (int)alias;
+	ret = (void *)alias;
 out:
-	return ERR_PTR(ret);
+	return ret;
 }
 
 void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) {