diff options
| author | Patrick Boettcher <pb@linuxtv.org> | 2006-08-19 20:57:04 +0200 |
|---|---|---|
| committer | Patrick Boettcher <pb@linuxtv.org> | 2006-08-19 20:57:04 +0200 |
| commit | d6274d7703aa9380cea45af71f3011e1a705646c (patch) | |
| tree | a740133231f9ebadfadbe986d8bc7bdd2486a028 /linux/drivers/media/dvb/dvb-usb/dibusb-mb.c | |
| parent | eb4857b848cc4500823e524adbe5c213e2717e07 (diff) | |
| parent | 8ab83d48dae5d54d59e02e8c0087580aba1d6842 (diff) | |
| download | mediapointer-dvb-s2-d6274d7703aa9380cea45af71f3011e1a705646c.tar.gz mediapointer-dvb-s2-d6274d7703aa9380cea45af71f3011e1a705646c.tar.bz2 | |
merge from main
From: Patrick Boettcher <pb@linuxtv.org>
merge from main
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-usb/dibusb-mb.c')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-usb/dibusb-mb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c index b4efa3772..f762d175f 100644 --- a/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c +++ b/linux/drivers/media/dvb/dvb-usb/dibusb-mb.c @@ -21,11 +21,11 @@ static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_device *d) demod_cfg.demod_address = 0x8; - if ((d->fe = dib3000mb_attach(&demod_cfg,&d->i2c_adap,&st->ops)) == NULL) { - d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c; - d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c; + if ((d->fe = dib3000mb_attach(&demod_cfg,&d->i2c_adap,&st->ops)) == NULL) return -ENODEV; - } + + d->fe->ops.tuner_ops.init = dvb_usb_tuner_init_i2c; + d->fe->ops.tuner_ops.set_params = dvb_usb_tuner_set_params_i2c; d->tuner_pass_ctrl = st->ops.tuner_pass_ctrl; |