diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-05 14:18:03 -0700 |
| commit | e9563355ac1175dd3440dc2ea5c28b27ed51a283 (patch) | |
| tree | 8546d55832714b5d19ba4c7799266918ca04882e /drivers/staging/pohmelfs/inode.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | Staging: ti-st: update TODO (diff) | |
| download | linux-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.tar.xz linux-dev-e9563355ac1175dd3440dc2ea5c28b27ed51a283.zip | |
Staging: Merge staging-next into Linus's tree
Conflicts:
drivers/staging/Kconfig
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/cx25821/cx25821-audups11.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/pohmelfs/inode.c')
| -rw-r--r-- | drivers/staging/pohmelfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c index 643b413d9f0f..bc1c6051a6f6 100644 --- a/drivers/staging/pohmelfs/inode.c +++ b/drivers/staging/pohmelfs/inode.c @@ -815,7 +815,7 @@ static int pohmelfs_readpages(struct file *file, struct address_space *mapping, } /* - * Small addres space operations for POHMELFS. + * Small address space operations for POHMELFS. */ const struct address_space_operations pohmelfs_aops = { .readpage = pohmelfs_readpage, @@ -847,7 +847,7 @@ static void pohmelfs_destroy_inode(struct inode *inode) } /* - * ->alloc_inode() callback. Allocates inode and initilizes private data. + * ->alloc_inode() callback. Allocates inode and initializes private data. */ static struct inode *pohmelfs_alloc_inode(struct super_block *sb) { @@ -1266,7 +1266,7 @@ static void pohmelfs_put_super(struct super_block *sb) { struct pohmelfs_sb *psb = POHMELFS_SB(sb); struct pohmelfs_inode *pi; - unsigned int count; + unsigned int count = 0; unsigned int in_drop_list = 0; struct inode *inode, *tmp; |