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>

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;
 }