diff --git a/[refs] b/[refs]
index 61c314ec7eeb..67d1350e8650 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b9b936f278163614543d66f8e8c93d5484dd148
+refs/heads/master: 155c6ab9ed255745758b6aa0f266e4d40aa32a21
diff --git a/trunk/drivers/media/video/bt8xx/bttv-audio-hook.c b/trunk/drivers/media/video/bt8xx/bttv-audio-hook.c
index a075198f8300..67b63423575f 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-audio-hook.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-audio-hook.c
@@ -101,24 +101,28 @@ void gvbctv5pci_audio(struct bttv *btv, struct v4l2_tuner *t, int set)
 	} else {
 		switch (val & 0x70) {
 		  case 0x10:
-			t->audmode = V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
+			t->rxsubchans = V4L2_TUNER_SUB_LANG1 |  V4L2_TUNER_SUB_LANG2;
 			break;
 		  case 0x30:
-			t->audmode = V4L2_TUNER_MODE_LANG2;
+			t->rxsubchans = V4L2_TUNER_SUB_LANG2;
 			break;
 		  case 0x50:
-			t->audmode = V4L2_TUNER_MODE_LANG1;
+			t->rxsubchans = V4L2_TUNER_SUB_LANG1;
 			break;
 		  case 0x60:
-			t->audmode = V4L2_TUNER_MODE_STEREO;
+			t->rxsubchans = V4L2_TUNER_SUB_STEREO;
 			break;
 		  case 0x70:
-			t->audmode = V4L2_TUNER_MODE_MONO;
+			t->rxsubchans = V4L2_TUNER_SUB_MONO;
 			break;
 		  default:
-			t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO |
-				  V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
+			t->rxsubchans = V4L2_TUNER_SUB_MONO |
+				         V4L2_TUNER_SUB_STEREO |
+				         V4L2_TUNER_SUB_LANG1 |
+				         V4L2_TUNER_SUB_LANG2;
 		}
+		t->audmode = V4L2_TUNER_MODE_STEREO |
+			  V4L2_TUNER_MODE_LANG1  | V4L2_TUNER_MODE_LANG2;
 	}
 }