diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-25 14:07:42 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-02-26 09:52:25 -0300 |
| commit | 823b460ee76d0e4e1a9d50e7c1d4aebc0e9e467b (patch) | |
| tree | 85f73d2cfff76ffd173a283575aa6fe4f6f89259 /drivers/media/usb/dvb-usb-v2/dvb_usb.h | |
| parent | 6f6c77d8d2e2fc77395d6bb9ed670161f18b6bd4 (diff) | |
| download | linux-823b460ee76d0e4e1a9d50e7c1d4aebc0e9e467b.tar.bz2 | |
[media] dvb-usb-v2: create one media_dev per adapter
Instead of assuming just one adapter, change the code to store
one media controller per adapter.
This works fine for dvb-usb, as, on all drivers here, it is not
possible to write a media graph that would mix resources between
the two different adapters.
Acked-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/dvb-usb-v2/dvb_usb.h')
| -rw-r--r-- | drivers/media/usb/dvb-usb-v2/dvb_usb.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb.h b/drivers/media/usb/dvb-usb-v2/dvb_usb.h index dbac1633312a..023d91f7e654 100644 --- a/drivers/media/usb/dvb-usb-v2/dvb_usb.h +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb.h @@ -392,10 +392,6 @@ struct dvb_usb_device { struct delayed_work rc_query_work; void *priv; - -#if defined(CONFIG_MEDIA_CONTROLLER_DVB) - struct media_device *media_dev; -#endif }; extern int dvb_usbv2_probe(struct usb_interface *, |