ALSA: usb-audio: fix combine_word problem
commit44cf344afe9976e27b64c2bac861f5d45009f3fc
authorJulian Anastasov <ja@ssi.bg>
Fri, 6 Nov 2009 21:44:53 +0000 (6 23:44 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 8 Dec 2009 18:20:59 +0000 (8 10:20 -0800)
tree755691b0e6998f532ddd93dc4e7eac3851b56c00
parent57a0aa351bff86bd529c8638a376cf0a18b60eae
ALSA: usb-audio: fix combine_word problem

commit f495088210c8b9e20791d995a8210170c68d2deb upstream.

Fix combine_word problem where first octet is not
read properly. The only affected place seems to be the
INPUT_TERMINAL type. Before now, sound controls can be created
with the output terminal's name which is a fallback mechanism
used only for unknown input terminal types. For example,
Line can wrongly appear as Speaker. After the change it
should appear as Line.

The side effect of this change can be that users
can expect the wrong control name in their scripts or
programs while now we return the correct one.

Probably, these defines should use get_unaligned_le16 and
friends.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
sound/usb/usbaudio.h