diff options
author | Michael Krufky <mkrufky@kernellabs.com> | 2011-09-06 08:31:57 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-06 13:21:42 -0400 |
commit | 77eed219fed5a913f59329cc846420fdeab0150f (patch) | |
tree | abcbcb0a970fb7b81efb11e229151adce78e166b /drivers/media/dvb/dvb-usb/friio.c | |
parent | 4c66c9205c0788e18eb09d482461aa2f551ee046 (diff) |
[media] dvb-usb: refactor MFE code for individual streaming config per frontend
refactor MFE code to allow for individual streaming configuration
for each frontend
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/friio.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/friio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/friio.c b/drivers/media/dvb/dvb-usb/friio.c index 0e4b559720ea..b092dc2137cd 100644 --- a/drivers/media/dvb/dvb-usb/friio.c +++ b/drivers/media/dvb/dvb-usb/friio.c | |||
@@ -403,8 +403,8 @@ static int friio_frontend_attach(struct dvb_usb_adapter *adap) | |||
403 | if (friio_initialize(adap->dev) < 0) | 403 | if (friio_initialize(adap->dev) < 0) |
404 | return -EIO; | 404 | return -EIO; |
405 | 405 | ||
406 | adap->fe[0] = jdvbt90502_attach(adap->dev); | 406 | adap->fe_adap[0].fe = jdvbt90502_attach(adap->dev); |
407 | if (adap->fe[0] == NULL) | 407 | if (adap->fe_adap[0].fe == NULL) |
408 | return -EIO; | 408 | return -EIO; |
409 | 409 | ||
410 | return 0; | 410 | return 0; |
@@ -473,6 +473,8 @@ static struct dvb_usb_device_properties friio_properties = { | |||
473 | /* caps:0 => no pid filter, 188B TS packet */ | 473 | /* caps:0 => no pid filter, 188B TS packet */ |
474 | /* GL861 has a HW pid filter, but no info available. */ | 474 | /* GL861 has a HW pid filter, but no info available. */ |
475 | { | 475 | { |
476 | .num_frontends = 1, | ||
477 | .fe = {{ | ||
476 | .caps = 0, | 478 | .caps = 0, |
477 | 479 | ||
478 | .frontend_attach = friio_frontend_attach, | 480 | .frontend_attach = friio_frontend_attach, |
@@ -490,6 +492,7 @@ static struct dvb_usb_device_properties friio_properties = { | |||
490 | } | 492 | } |
491 | } | 493 | } |
492 | }, | 494 | }, |
495 | }}, | ||
493 | } | 496 | } |
494 | }, | 497 | }, |
495 | .i2c_algo = &gl861_i2c_algo, | 498 | .i2c_algo = &gl861_i2c_algo, |