aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/tools
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-08-01 11:12:10 +0200
committerTakashi Iwai <tiwai@suse.de>2013-08-01 11:12:10 +0200
commit209fb1b7e298c5f5a93a9450bc9e9e7923f745d9 (patch)
tree27cbfa78e5eeaceb2aae1c165f7f0e24f6fee286 /tools
parentALSA: compress: fix the return value for SNDRV_COMPRESS_VERSION (diff)
parentMerge remote-tracking branch 'asoc/fix/wm0010' into asoc-linus (diff)
downloadwireguard-linux-209fb1b7e298c5f5a93a9450bc9e9e7923f745d9.tar.xz
wireguard-linux-209fb1b7e298c5f5a93a9450bc9e9e7923f745d9.zip
Merge tag 'asoc-v3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.11 A fix to make sure userspace knows when control writes have caused a change in value, fixing some UIs, plus a few few driver fixes mainly cleaning up issues from recent refactorings on less mainstream platforms.
Diffstat (limited to '')
-rw-r--r--tools/hv/hv_kvp_daemon.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c
index ca9fa4d32e07..07819bfa7dba 100644
--- a/tools/hv/hv_kvp_daemon.c
+++ b/tools/hv/hv_kvp_daemon.c
@@ -1026,9 +1026,10 @@ kvp_get_ip_info(int family, char *if_name, int op,
if (sn_offset == 0)
strcpy(sn_str, cidr_mask);
- else
+ else {
+ strcat((char *)ip_buffer->sub_net, ";");
strcat(sn_str, cidr_mask);
- strcat((char *)ip_buffer->sub_net, ";");
+ }
sn_offset += strlen(sn_str) + 1;
}