1 files changed, 38 insertions, 14 deletions

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index d60fc562aecd..0456dda2624d 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -23,6 +23,7 @@
       TDA9887 (world), TDA9885 (USA)
       Note: OP2 of tda988x must be set to 1, else MT2032 is disabled!
    - KNC One TV-Station RDS (saa7134)
+   - Hauppauge PVR-150/500 (possibly more)
 */
 
 
@@ -49,7 +50,7 @@ MODULE_LICENSE("GPL");
 struct tda9887 {
         struct i2c_client  client;
         v4l2_std_id        std;
-        unsigned int       radio;
+        enum tuner_mode    mode;
         unsigned int       config;
         unsigned int       pinnacle_id;
         unsigned int       using_v4l2;
@@ -196,7 +197,7 @@ static struct tvnorm tvnorms[] = {
                 .b     = ( cNegativeFmTV  |
                            cQSS           ),
                 .c     = ( cDeemphasisON  |
-                           cDeemphasis50  ),
+                           cDeemphasis75  ),
                 .e     = ( cGating_36     |
                            cAudioIF_4_5   |
                            cVideoIF_45_75 ),
@@ -364,7 +365,7 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
         struct tvnorm *norm = NULL;
         int i;
 
-        if (t->radio) {
+        if (t->mode == T_RADIO) {
                 if (t->radio_mode == V4L2_TUNER_MODE_MONO)
                         norm = &radio_mono;
                 else
@@ -378,7 +379,7 @@ static int tda9887_set_tvnorm(struct tda9887 *t, char *buf)
                 }
         }
         if (NULL == norm) {
-                dprintk(PREFIX "Oops: no tvnorm entry found\n");
+                dprintk(PREFIX "Unsupported tvnorm entry - audio muted\n");
                 return -1;
         }
 
@@ -519,6 +520,12 @@ static int tda9887_fixup_std(struct tda9887 *t)
                         dprintk(PREFIX "insmod fixup: PAL => PAL-DK\n");
                         t->std = V4L2_STD_PAL_DK;
                         break;
+                case '-':
+                        /* default parameter, do nothing */
+                        break;
+                default:
+                        printk(PREFIX "pal= argument not recognised\n");
+                        break;
                 }
         }
         if ((t->std & V4L2_STD_SECAM) == V4L2_STD_SECAM) {
@@ -535,6 +542,12 @@ static int tda9887_fixup_std(struct tda9887 *t)
                         dprintk(PREFIX "insmod fixup: SECAM => SECAM-L\n");
                         t->std = V4L2_STD_SECAM_L;
                         break;
+                case '-':
+                        /* default parameter, do nothing */
+                        break;
+                default:
+                        printk(PREFIX "secam= argument not recognised\n");
+                        break;
                 }
         }
         return 0;
@@ -569,6 +582,10 @@ static int tda9887_configure(struct tda9887 *t)
         tda9887_set_config(t,buf);
         tda9887_set_insmod(t,buf);
 
+        if (t->mode == T_STANDBY) {
+                buf[1] |= cForcedMuteAudioON;
+        }
+
 
         dprintk(PREFIX "writing: b=0x%02x c=0x%02x e=0x%02x\n",
                 buf[1],buf[2],buf[3]);
@@ -653,10 +670,17 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
         /* --- configuration --- */
         case AUDC_SET_RADIO:
-                t->radio = 1;
+        {
+                t->mode = T_RADIO;
                 tda9887_configure(t);
                 break;
-
+        }
+        case TUNER_SET_STANDBY:
+        {
+                t->mode = T_STANDBY;
+                tda9887_configure(t);
+                break;
+        }
         case AUDC_CONFIG_PINNACLE:
         {
                 int *i = arg;
@@ -689,7 +713,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 struct video_channel *vc = arg;
 
                 CHECK_V4L2;
-                t->radio = 0;
+                t->mode = T_ANALOG_TV;
                 if (vc->norm < ARRAY_SIZE(map))
                         t->std = map[vc->norm];
                 tda9887_fixup_std(t);
@@ -701,7 +725,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 v4l2_std_id *id = arg;
 
                 SWITCH_V4L2;
-                t->radio = 0;
+                t->mode = T_ANALOG_TV;
                 t->std   = *id;
                 tda9887_fixup_std(t);
                 tda9887_configure(t);
@@ -713,14 +737,14 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
                 SWITCH_V4L2;
                 if (V4L2_TUNER_ANALOG_TV == f->type) {
-                        if (t->radio == 0)
+                        if (t->mode == T_ANALOG_TV)
                                 return 0;
-                        t->radio = 0;
+                        t->mode = T_ANALOG_TV;
                 }
                 if (V4L2_TUNER_RADIO == f->type) {
-                        if (t->radio == 1)
+                        if (t->mode == T_RADIO)
                                 return 0;
-                        t->radio = 1;
+                        t->mode = T_RADIO;
                 }
                 tda9887_configure(t);
                 break;
@@ -735,7 +759,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                 };
                 struct v4l2_tuner* tuner = arg;
 
-                if (t->radio) {
+                if (t->mode == T_RADIO) {
                         __u8 reg = 0;
                         tuner->afc=0;
                         if (1 == i2c_master_recv(&t->client,&reg,1))
@@ -747,7 +771,7 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
         {
                 struct v4l2_tuner* tuner = arg;
 
-                if (t->radio) {
+                if (t->mode == T_RADIO) {
                         t->radio_mode = tuner->audmode;
                         tda9887_configure (t);
                 }