diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-02-07 21:34:03 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-07 21:34:03 -0500 |
commit | 2e18e047981ae04be9bd0d9760057f7c1a7b3785 (patch) | |
tree | 999941abf466ce4d6915273e2e7a42bf0a107385 /fs/befs/linuxvfs.c | |
parent | b06ede84dd1473dec7c6af03a41c8d04d2fee437 (diff) | |
parent | cfefe99795251d76d92e8457f4152f532a961ec5 (diff) |
Merge branch 'sh/dmaengine'
Conflicts:
arch/sh/drivers/dma/dma-sh.c
Diffstat (limited to 'fs/befs/linuxvfs.c')
-rw-r--r-- | fs/befs/linuxvfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index 33baf27fac7..34ddda888e6 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
@@ -873,6 +873,7 @@ befs_fill_super(struct super_block *sb, void *data, int silent) | |||
873 | brelse(bh); | 873 | brelse(bh); |
874 | 874 | ||
875 | unacquire_priv_sbp: | 875 | unacquire_priv_sbp: |
876 | kfree(befs_sb->mount_opts.iocharset); | ||
876 | kfree(sb->s_fs_info); | 877 | kfree(sb->s_fs_info); |
877 | 878 | ||
878 | unacquire_none: | 879 | unacquire_none: |