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_sysfs.c | |
parent | ALSA: firewire: use KBUILD_MODNAME for struct driver.name instead of string (diff) | |
parent | ALSA: line6: Fix endless MIDI read loop (diff) | |
download | wireguard-linux-cf4afed90c1f926d12277213b54d830c839a1bda.tar.xz wireguard-linux-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_sysfs.c')
-rw-r--r-- | sound/pci/hda/hda_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_sysfs.c b/sound/pci/hda/hda_sysfs.c index 0607ed5d1959..eb8ec109d7ad 100644 --- a/sound/pci/hda/hda_sysfs.c +++ b/sound/pci/hda/hda_sysfs.c @@ -222,7 +222,7 @@ static ssize_t init_verbs_show(struct device *dev, int i, len = 0; mutex_lock(&codec->user_mutex); snd_array_for_each(&codec->init_verbs, i, v) { - len += snprintf(buf + len, PAGE_SIZE - len, + len += scnprintf(buf + len, PAGE_SIZE - len, "0x%02x 0x%03x 0x%04x\n", v->nid, v->verb, v->param); } @@ -272,7 +272,7 @@ static ssize_t hints_show(struct device *dev, int i, len = 0; mutex_lock(&codec->user_mutex); snd_array_for_each(&codec->hints, i, hint) { - len += snprintf(buf + len, PAGE_SIZE - len, + len += scnprintf(buf + len, PAGE_SIZE - len, "%s = %s\n", hint->key, hint->val); } mutex_unlock(&codec->user_mutex); |