[media] [BUG] it913x ver 1.20. PID filter problems

Fixes issues with PID filter
Stalling of some channels when PID is on.
PID filter not turning off fully.
PID filter can now turn on and off each index.

Removed PID_RST from it913x_pid_filter_ctrl.
Replaced with PID_EN removed from it913x_pid_filter

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/media/dvb/dvb-usb/it913x.c b/drivers/media/dvb/dvb-usb/it913x.c
index 635429522e9..6bf2086b54d 100644
--- a/drivers/media/dvb/dvb-usb/it913x.c
+++ b/drivers/media/dvb/dvb-usb/it913x.c
@@ -259,15 +259,15 @@ static u32 it913x_query(struct usb_device *udev, u8 pro)
 
 static int it913x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
 {
-        int ret = 0;
+        struct usb_device *udev = adap->dev->udev;
+        int ret;
         u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD;
 
         if (mutex_lock_interruptible(&adap->dev->i2c_mutex) < 0)
                         return -EAGAIN;
         deb_info(1, "PID_C  (%02x)", onoff);
 
-        if (!onoff)
-                ret = it913x_wr_reg(adap->dev->udev, pro, PID_RST, 0x1);
+        ret = it913x_wr_reg(udev, pro, PID_EN, onoff);
 
         mutex_unlock(&adap->dev->i2c_mutex);
         return ret;
@@ -277,24 +277,20 @@ static int it913x_pid_filter(struct dvb_usb_adapter *adap,
                 int index, u16 pid, int onoff)
 {
         struct usb_device *udev = adap->dev->udev;
-        int ret = 0;
+        int ret;
         u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD;
 
         if (mutex_lock_interruptible(&adap->dev->i2c_mutex) < 0)
                         return -EAGAIN;
         deb_info(1, "PID_F  (%02x)", onoff);
-        if (onoff) {
-                ret = it913x_wr_reg(udev, pro, PID_EN, 0x1);
 
-                ret |= it913x_wr_reg(udev, pro, PID_LSB, (u8)(pid & 0xff));
+        ret = it913x_wr_reg(udev, pro, PID_LSB, (u8)(pid & 0xff));
 
-                ret |= it913x_wr_reg(udev, pro, PID_MSB, (u8)(pid >> 8));
+        ret |= it913x_wr_reg(udev, pro, PID_MSB, (u8)(pid >> 8));
 
-                ret |= it913x_wr_reg(udev, pro, PID_INX_EN, (u8)onoff);
+        ret |= it913x_wr_reg(udev, pro, PID_INX_EN, (u8)onoff);
 
-                ret |= it913x_wr_reg(udev, pro, PID_INX, (u8)(index & 0x1f));
-
-        }
+        ret |= it913x_wr_reg(udev, pro, PID_INX, (u8)(index & 0x1f));
 
         mutex_unlock(&adap->dev->i2c_mutex);
         return 0;
@@ -839,5 +835,5 @@ module_exit(it913x_module_exit);
 
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("it913x USB 2 Driver");
-MODULE_VERSION("1.18");
+MODULE_VERSION("1.20");
 MODULE_LICENSE("GPL");