Merge tag 'mvebu-fixes-3.13-2' of git://git.infradead.org/linux-mvebu into fixes

[~andy/linux] / fs / befs / linuxvfs.c

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index daa15d6ba45077755d2bc859cfffb44f6a82bfd0..845d2d690ce2dc2becddef70041a3e6b69440d62 100644 (file)
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -324,8 +324,8 @@ static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
        befs_debug(sb, "---> befs_read_inode() " "inode = %lu", ino);
 
        inode = iget_locked(sb, ino);
-       if (IS_ERR(inode))
-               return inode;
+       if (!inode)
+               return ERR_PTR(-ENOMEM);
        if (!(inode->i_state & I_NEW))
                return inode;