summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-04 10:05:07 +0100
committerTakashi Iwai <tiwai@suse.de>2013-11-04 10:05:07 +0100
commitebfe1068f9ca4d0f25beca7a65d652380c40f226 (patch)
tree109cfece95e42345d915c4c13e3bb1697ff02f65 /Documentation
parentALSA: hda - not choose assigned converters for unused pins of Valleyview (diff)
parentMerge remote-tracking branch 'asoc/topic/wm8996' into asoc-next (diff)
downloadlinux-ebfe1068f9ca4d0f25beca7a65d652380c40f226.tar.xz
linux-ebfe1068f9ca4d0f25beca7a65d652380c40f226.zip
Merge tag 'asoc-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.13 A few final updates for v3.13, all driver updates apart from some DPCM and Coverity fixes which should have minor impact on practical systems.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/connector/ucon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/connector/ucon.c b/Documentation/connector/ucon.c
index 4848db8c71ff..8a4da64e02a8 100644
--- a/Documentation/connector/ucon.c
+++ b/Documentation/connector/ucon.c
@@ -71,7 +71,7 @@ static int netlink_send(int s, struct cn_msg *msg)
nlh->nlmsg_seq = seq++;
nlh->nlmsg_pid = getpid();
nlh->nlmsg_type = NLMSG_DONE;
- nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
+ nlh->nlmsg_len = size;
nlh->nlmsg_flags = 0;
m = NLMSG_DATA(nlh);