diff options
| author | Patrick Boettcher | 2006-08-02 13:44:31 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2006-09-26 16:53:47 +0200 |
| commit | 5a19f312162abd1356cdcda608f2b13502a383cc (patch) | |
| tree | ec54b98becf8e47f215587f33e26784fc4011732 /drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | |
| parent | V4L/DVB (4461): Added missing dibx000-common code and headers (diff) | |
| download | kernel-qcow2-linux-5a19f312162abd1356cdcda608f2b13502a383cc.tar.gz kernel-qcow2-linux-5a19f312162abd1356cdcda608f2b13502a383cc.tar.xz kernel-qcow2-linux-5a19f312162abd1356cdcda608f2b13502a383cc.zip | |
V4L/DVB (4465): Attach the dib3000mc correctly
Flynn Marquardt found out that there is problem with the new dib3000mc-driver
when using with the real dib3000mc. It resulted in a segfault.
Fixed two things: use the correct I2C address and do not attach a tuner, when
the demod was previously failing.
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-dvb.c')
| -rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c index 71a754e2287e..3a19689d9c9a 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c @@ -191,12 +191,13 @@ int dvb_usb_fe_init(struct dvb_usb_device* d) d->fe = NULL; return -ENODEV; } + + /* only attach the tuner if the demod is there */ + if (d->props.tuner_attach != NULL) + d->props.tuner_attach(d); } else err("no frontend was attached by '%s'",d->desc->name); - if (d->props.tuner_attach != NULL) - d->props.tuner_attach(d); - return 0; } |