diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-11-13 07:48:07 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-11-13 07:48:07 +0100 |
commit | 6214b54cbf0778804de1297444c7661e70bc4d74 (patch) | |
tree | 262a96d1be839a30e6e8d3f3452806b7f337148c /fs/xfs/xfs_inode.c | |
parent | 05193639ca977cc889668718adb38db6d585045b (diff) | |
parent | ba027da8eb309252cb611f23808da51487f68e12 (diff) | |
download | kernel_replicant_linux-6214b54cbf0778804de1297444c7661e70bc4d74.tar.gz kernel_replicant_linux-6214b54cbf0778804de1297444c7661e70bc4d74.tar.bz2 kernel_replicant_linux-6214b54cbf0778804de1297444c7661e70bc4d74.zip |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A few small fixes plus a large but simple change for WM5102 which writes
out a bunch of register updates to the device when we enable the clock
as recommended following chip evaluation.
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r-- | fs/xfs/xfs_inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 2778258fcfa2..1938b41ee9f5 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -1509,7 +1509,8 @@ xfs_ifree_cluster( * to mark all the active inodes on the buffer stale. */ bp = xfs_trans_get_buf(tp, mp->m_ddev_targp, blkno, - mp->m_bsize * blks_per_cluster, 0); + mp->m_bsize * blks_per_cluster, + XBF_UNMAPPED); if (!bp) return ENOMEM; |