V4L/DVB (5043): Pvrusb2: video standard broadcast fix for radio mode

Ensure we don't accidentally broadcast the standard while in radio mode.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 93b8d077c11e..05121666b9ba 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -39,7 +39,6 @@
 #define OP_AUDIORATE 4
 #define OP_SIZE 5
 #define OP_LOG 6
-#define OP_RADIO 7
 
 static const struct pvr2_i2c_op * const ops[] = {
         [OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
@@ -48,7 +47,6 @@ static const struct pvr2_i2c_op * const ops[] = {
         [OP_FREQ] = &pvr2_i2c_op_v4l2_frequency,
         [OP_SIZE] = &pvr2_i2c_op_v4l2_size,
         [OP_LOG] = &pvr2_i2c_op_v4l2_log,
-        [OP_RADIO] = &pvr2_i2c_op_v4l2_radio,
 };
 
 void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
@@ -60,8 +58,7 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
                         (1 << OP_VOLUME) |
                         (1 << OP_FREQ) |
                         (1 << OP_SIZE) |
-                        (1 << OP_LOG) |
-                        (1 << OP_RADIO));
+                        (1 << OP_LOG));
 
         if (id == I2C_DRIVERID_MSP3400) {
                 if (pvr2_i2c_msp3400_setup(hdw,cp)) {