Merge remote-tracking branch 'rtc/rtc-next'

[karo-tx-linux.git] / fs / ncpfs / dir.c

diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
index 93575e91a7aa7b2993afb16b781c657fa2d6a7af..356816e7bc90d2d2de4a4fc0e25b10ad42b839dc 100644 (file)
--- a/fs/ncpfs/dir.c
+++ b/fs/ncpfs/dir.c
@@ -597,7 +597,7 @@ ncp_fill_cache(struct file *file, struct dir_context *ctx,
        qname.name = __name;
 
        newdent = d_hash_and_lookup(dentry, &qname);
-       if (unlikely(IS_ERR(newdent)))
+       if (IS_ERR(newdent))
                goto end_advance;
        if (!newdent) {
                newdent = d_alloc(dentry, &qname);