diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-03-09 19:49:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-03-09 19:50:18 +0100 |
| commit | cf4afed90c1f926d12277213b54d830c839a1bda (patch) | |
| tree | b1c7319e85443d097634ef6a3d4623afc64188cb /sound/pci/hda/hda_codec.c | |
| parent | 9c0d16ac059148fc7647f5f9e90df6f34d3439f0 (diff) | |
| parent | d683469b3c93d7e2afd39e6e1970f24700eb7a68 (diff) | |
| download | lwn-cf4afed90c1f926d12277213b54d830c839a1bda.tar.gz lwn-cf4afed90c1f926d12277213b54d830c839a1bda.zip | |
Merge branch 'for-linus' into for-next
Back-merge of 5.6 devel branch for further changes in 5.7 cycle
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 97a03685dd8b..a34a2c9f4bcf 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4022,7 +4022,7 @@ void snd_print_pcm_bits(int pcm, char *buf, int buflen) for (i = 0, j = 0; i < ARRAY_SIZE(bits); i++) if (pcm & (AC_SUPPCM_BITS_8 << i)) - j += snprintf(buf + j, buflen - j, " %d", bits[i]); + j += scnprintf(buf + j, buflen - j, " %d", bits[i]); buf[j] = '\0'; /* necessary when j == 0 */ } |