Merge tag 'sound-fix-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux-2.6-microblaze.git] / fs / befs / btree.c

diff --git a/fs/befs/btree.c b/fs/befs/btree.c
index 0826e91..22c1662 100644 (file)
--- a/fs/befs/btree.c
+++ b/fs/befs/btree.c
@@ -137,8 +137,8 @@ static int
 befs_bt_read_super(struct super_block *sb, befs_data_stream * ds,
                   befs_btree_super * sup)
 {
-       struct buffer_head *bh = NULL;
-       befs_disk_btree_super *od_sup = NULL;
+       struct buffer_head *bh;
+       befs_disk_btree_super *od_sup;
 
        befs_debug(sb, "---> %s", __func__);
 
@@ -250,7 +250,7 @@ int
 befs_btree_find(struct super_block *sb, befs_data_stream * ds,
                const char *key, befs_off_t * value)
 {
-       struct befs_btree_node *this_node = NULL;
+       struct befs_btree_node *this_node;
        befs_btree_super bt_super;
        befs_off_t node_off;
        int res;