Merge tag 'sound-4.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / fs / befs / linuxvfs.c

diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
index 71112aa07d843fccc43d8d126d3c8e7757303e7f..7da05b159ade2d21e5055318723ed857f8f35f64 100644 (file)
--- a/fs/befs/linuxvfs.c
+++ b/fs/befs/linuxvfs.c
@@ -155,7 +155,7 @@ befs_get_block(struct inode *inode, sector_t block,
 static struct dentry *
 befs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
 {
-       struct inode *inode = NULL;
+       struct inode *inode;
        struct super_block *sb = dir->i_sb;
        const befs_data_stream *ds = &BEFS_I(dir)->i_data.ds;
        befs_off_t offset;
@@ -294,10 +294,10 @@ static void init_once(void *foo)
 
 static struct inode *befs_iget(struct super_block *sb, unsigned long ino)
 {
-       struct buffer_head *bh = NULL;
-       befs_inode *raw_inode = NULL;
+       struct buffer_head *bh;
+       befs_inode *raw_inode;
        struct befs_sb_info *befs_sb = BEFS_SB(sb);
-       struct befs_inode_info *befs_ino = NULL;
+       struct befs_inode_info *befs_ino;
        struct inode *inode;
        long ret = -EIO;