summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-06-16 16:25:22 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 07:56:34 -0300
commit1a590010a262b0797a4a42287959107d2c41c8ca (patch)
tree1916bb861e5f7055330b884cf18198d9aa6c5d34
parent6400a8c5afb54a1018c4d01b7f1ad28c4e0ef659 (diff)
downloadlinux-1a590010a262b0797a4a42287959107d2c41c8ca.tar.gz
linux-1a590010a262b0797a4a42287959107d2c41c8ca.tar.bz2
linux-1a590010a262b0797a4a42287959107d2c41c8ca.zip
[media] af9015: update USB streaming configuration logic
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/af9015.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index a9d9f9a23450..a429c24d8b30 100644
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -602,22 +602,8 @@ error:
static int af9015_get_usb_stream_config(struct dvb_frontend *fe,
struct usb_data_stream_properties *stream)
{
- struct dvb_usb_adapter *adap;
-
- deb_info("%s: fe=%p\n", __func__, fe);
-
- stream->type = USB_BULK;
- stream->count = 8;
- stream->endpoint = 0x84;
- stream->u.bulk.buffersize = TS_USB20_FRAME_SIZE;
-
- if (fe == NULL)
- return 0;
-
- adap = fe->dvb->priv;
-
- if (adap->id == 1)
- stream->endpoint = 0x85;
+ struct dvb_usb_adapter *adap = fe->dvb->priv;
+ deb_info("%s: adap=%d\n", __func__, adap->id);
if (adap->dev->udev->speed == USB_SPEED_FULL)
stream->u.bulk.buffersize = TS_USB11_FRAME_SIZE;
@@ -1335,6 +1321,10 @@ static struct dvb_usb_device_properties af9015_props = {
.pid_filter_count = 32,
.pid_filter = af9015_pid_filter,
.pid_filter_ctrl = af9015_pid_filter_ctrl,
+
+ .stream = DVB_USB_STREAM_BULK(0x84, 8, TS_USB20_FRAME_SIZE),
+ }, {
+ .stream = DVB_USB_STREAM_BULK(0x85, 8, TS_USB20_FRAME_SIZE),
},
},
};