Merge branch 'topic/misc' into topic/pcsp-fix

[linux-2.6-omap-h63xx.git] / arch / parisc / hpux / fs.c

diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c
index 69ff671498e53069af7a1575c2745702a117930d..bd9a4db3bd4cd1ab14ddb6c7aadcdd44afc37dcd 100644 (file)
--- a/arch/parisc/hpux/fs.c
+++ b/arch/parisc/hpux/fs.c
@@ -104,7 +104,7 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
        buf->count -= reclen;
        return 0;
 Efault:
-       buffer->error = -EFAULT;
+       buf->error = -EFAULT;
        return -EFAULT;
 }
 
@@ -127,9 +127,8 @@ int hpux_getdents(unsigned int fd, struct hpux_dirent __user *dirent, unsigned i
        buf.error = 0;
 
        error = vfs_readdir(file, filldir, &buf);
-       if (error < 0)
-               goto out_putf;
-       error = buf.error;
+       if (error >= 0)
+               error = buf.error;
        lastdirent = buf.previous;
        if (lastdirent) {
                if (put_user(file->f_pos, &lastdirent->d_off))