Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285727
b: refs/heads/master
c: ed3189c
h: refs/heads/master
i:
  285725: 739208e
  285723: 9c874cd
  285719: a15c331
  285711: 916d918
  285695: 6001b76
v: v3
  • Loading branch information
Malcolm Priestley authored and Mauro Carvalho Chehab committed Jan 6, 2012
1 parent d3fb0f7 commit e946561
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d2f7a1a2467c01b569d2a7fbf10e8894a3f0e496
refs/heads/master: ed3189cf989128fe283d6dbffbbae08b67d9e5bd
17 changes: 10 additions & 7 deletions trunk/drivers/media/dvb/dvb-usb/it913x.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,6 @@ static int it913x_pid_filter(struct dvb_usb_adapter *adap,
int ret = 0;
u8 pro = (adap->id == 0) ? DEV_0_DMOD : DEV_1_DMOD;

if (pid_filter > 0)
return 0;

if (mutex_lock_interruptible(&adap->dev->i2c_mutex) < 0)
return -EAGAIN;
deb_info(1, "PID_F (%02x)", onoff);
Expand Down Expand Up @@ -475,17 +472,23 @@ static int it913x_identify_state(struct usb_device *udev,
info("Dual mode=%x Remote=%x Tuner Type=%x", it913x_config.dual_mode
, remote, it913x_config.tuner_id_0);

/* Select Stream Buffer Size */
if (pid_filter)
/* Select Stream Buffer Size and pid filter option*/
if (pid_filter) {
props->adapter[0].fe[0].stream.u.bulk.buffersize =
TS_BUFFER_SIZE_MAX;
else
props->adapter[0].fe[0].caps &=
~DVB_USB_ADAP_NEED_PID_FILTERING;
} else
props->adapter[0].fe[0].stream.u.bulk.buffersize =
TS_BUFFER_SIZE_PID;

if (it913x_config.dual_mode) {
props->adapter[1].fe[0].stream.u.bulk.buffersize =
props->adapter[0].fe[0].stream.u.bulk.buffersize;
props->num_adapters = 2;
if (pid_filter)
props->adapter[1].fe[0].caps =
props->adapter[0].fe[0].caps;
} else
props->num_adapters = 1;

Expand Down Expand Up @@ -836,5 +839,5 @@ module_exit(it913x_module_exit);

MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
MODULE_DESCRIPTION("it913x USB 2 Driver");
MODULE_VERSION("1.17");
MODULE_VERSION("1.18");
MODULE_LICENSE("GPL");

0 comments on commit e946561

Please sign in to comment.