diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:56:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 06:56:56 +0200 |
| commit | b9b6e4ac2da74995cb7ac9394854a5fd563014c2 (patch) | |
| tree | 9a8db7b1f46d6542f9af2c87989cdafc3487a2c1 /fs/nfs/nfs4trace.h | |
| parent | d289619a219dd01e255d7b5e30f9171b25efea48 (diff) | |
| parent | f69eccc4b248ce53b1b830034babd0a795d5763c (diff) | |
Merge tag 'asoc-fix-v4.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.3
A bunch of driver fixes plus one core fix which fixes problems with
misreporting values from _SX controls following a recent refactoring.
This had gone unnoticed as such controls are quite rare.
Diffstat (limited to 'fs/nfs/nfs4trace.h')
| -rw-r--r-- | fs/nfs/nfs4trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h index 28df12e525ba..671cf68fe56b 100644 --- a/fs/nfs/nfs4trace.h +++ b/fs/nfs/nfs4trace.h @@ -409,7 +409,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event, __entry->flags = flags; __entry->fmode = (__force unsigned int)ctx->mode; __entry->dev = ctx->dentry->d_sb->s_dev; - if (!IS_ERR(state)) + if (!IS_ERR_OR_NULL(state)) inode = state->inode; if (inode != NULL) { __entry->fileid = NFS_FILEID(inode); |