From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Wed, 7 Feb 2007 20:38:23 +0000 (-0500)
Subject: v4l: cx2341x audio_properties is an u16, not u8
X-Git-Tag: v2.6.18.8~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdc752eef3a682cad5309822cb1d53913479c1bb;p=thirdparty%2Fkernel%2Fstable.git

v4l: cx2341x audio_properties is an u16, not u8

This bug broke the MPEG audio mode controls.

(cherry picked from commit cb2c7b4927c8f376b7ba9557978d8c59ed472664)

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/include/media/cx2341x.h b/include/media/cx2341x.h
index d91d88f93c8b3..ecad55bf0162c 100644
--- a/include/media/cx2341x.h
+++ b/include/media/cx2341x.h
@@ -49,7 +49,7 @@ struct cx2341x_mpeg_params {
 	enum v4l2_mpeg_audio_mode_extension audio_mode_extension;
 	enum v4l2_mpeg_audio_emphasis audio_emphasis;
 	enum v4l2_mpeg_audio_crc audio_crc;
-	u8 audio_properties;
+	u16 audio_properties;
 
 	/* video */
 	enum v4l2_mpeg_video_encoding video_encoding;