diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-06-24 10:02:45 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-06-24 10:02:45 +0200 |
commit | 5c89c2c7fbfa9124dd521c375b9c82b9ed75bc28 (patch) | |
tree | 75d09ba90c72e75b3d488edd2c37c96c3f268952 /fs/cifs/fs_context.c | |
parent | 3099406ef4832124ce572cfbbc914e8a385ca38f (diff) | |
parent | 3b7961a326f8a7e03f54a19f02fedae8d488b80f (diff) |
Merge tag 'asoc-fix-v5.13-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Fixes for v5.13
A final batch of fixes for v5.13, this is larger than I'd like due to
the fixes for a series of suspend issues that Intel turned up in their
testing this week.
Diffstat (limited to 'fs/cifs/fs_context.c')
-rw-r--r-- | fs/cifs/fs_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c index 5d21cd905315..92d4ab029c91 100644 --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -1145,7 +1145,7 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, /* if iocharset not set then load_nls_default * is used by caller */ - cifs_dbg(FYI, "iocharset set to %s\n", ctx->iocharset); + cifs_dbg(FYI, "iocharset set to %s\n", ctx->iocharset); break; case Opt_netbiosname: memset(ctx->source_rfc1001_name, 0x20, |