---

yaml --- r: 161544 b: refs/heads/master c: 7ae2688 h: refs/heads/master v: v3
git-mirror · Sep 12, 2009 · a1ee073 · a1ee073
1 parent 367bcba
commit a1ee073
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad5f74c0ad9afcc9a20f35850aa5170768c64a0c
+refs/heads/master: 7ae26889635d0708bb2a0b5d21f99368abc2366c
diff --git a/trunk/drivers/media/video/saa7134/saa6752hs.c b/trunk/drivers/media/video/saa7134/saa6752hs.c
@@ -468,7 +468,7 @@ static int handle_ctrl(int has_ac3, struct saa6752hs_mpeg_params *params,
 		if (set && new != V4L2_MPEG_AUDIO_ENCODING_LAYER_2 &&
 		    (!has_ac3 || new != V4L2_MPEG_AUDIO_ENCODING_AC3))
 			return -ERANGE;
-		new = old;
+		params->au_encoding = new;
 		break;
 	case V4L2_CID_MPEG_AUDIO_L2_BITRATE:
 		old = params->au_l2_bitrate;