diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-08-25 17:56:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-08-25 17:56:09 +0200 |
| commit | a820cd3d25c2891028b5f296a8a871ce6dd92c0d (patch) | |
| tree | 3e86aeb1b898e9ca0dd6754dc7e6ff68865ee175 /fs/xfs/xfs_buf.c | |
| parent | abaa2274811d607679e8687b4118c4922a3517ac (diff) | |
| parent | cfb89f2e7505c6823020a18bbdc5410284305234 (diff) | |
Merge tag 'asoc-fix-v4.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linussound-4.8-rc4
ASoC: Fixes for v4.8
A clutch of fixes for v4.8. These are mainly driver specific, the most
notable ones being those for OMAP which fix a series of issues that
broke boot on some platforms there when deferred probe kicked in.
There's also one core fix for an issue when unbinding a card which for
some reason had managed to not manifest until recently.
Diffstat (limited to 'fs/xfs/xfs_buf.c')
| -rw-r--r-- | fs/xfs/xfs_buf.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 47a318ce82e0..607cc29bba21 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c @@ -115,7 +115,6 @@ xfs_buf_ioacct_dec( if (!(bp->b_flags & _XBF_IN_FLIGHT)) return; - ASSERT(bp->b_flags & XBF_ASYNC); bp->b_flags &= ~_XBF_IN_FLIGHT; percpu_counter_dec(&bp->b_target->bt_io_count); } |