Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 6a84388cacff..54b1f0e1ef58 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -865,7 +865,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
         if (is_bdev) {
                 fc->destroy_req = fuse_request_alloc();
                 if (!fc->destroy_req)
-                        goto err_put_root;
+                        goto err_free_init_req;
         }
 
         mutex_lock(&fuse_mutex);
@@ -895,6 +895,7 @@ static int fuse_fill_super(struct super_block *sb, void *data, int silent)
 
  err_unlock:
         mutex_unlock(&fuse_mutex);
+ err_free_init_req:
         fuse_request_free(init_req);
  err_put_root:
         dput(root_dentry);