diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-24 00:11:30 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-24 00:11:30 +0400 |
| commit | 59b30294e14fa6a370fdd2bc2921cca1f977ef16 (patch) | |
| tree | 7cb70f6233de563bc04da8cf420a02082e8a2ba5 /drivers/media/video/em28xx | |
| parent | a8ea0218625699a5c635655a17b565bab5888ea1 (diff) | |
| parent | 72565224609a23a60d10fcdf42f87a2fa8f7b16d (diff) | |
| download | linux-59b30294e14fa6a370fdd2bc2921cca1f977ef16.tar.xz | |
Merge branch 'v4l_for_linus' into staging/for_v3.4
* v4l_for_linus:
[media] cxd2820r: sleep on DVB-T/T2 delivery system switch
[media] anysee: fix CI init
[media] cxd2820r: remove unused parameter from cxd2820r_attach
[media] cxd2820r: fix dvb_frontend_ops
Diffstat (limited to 'drivers/media/video/em28xx')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-dvb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index 9449423098e0..aabbf4854f66 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c @@ -853,8 +853,7 @@ static int em28xx_dvb_init(struct em28xx *dev) case EM28174_BOARD_PCTV_290E: dvb->fe[0] = dvb_attach(cxd2820r_attach, &em28xx_cxd2820r_config, - &dev->i2c_adap, - NULL); + &dev->i2c_adap); if (dvb->fe[0]) { /* FE 0 attach tuner */ if (!dvb_attach(tda18271_attach, |