V4L/DVB (4468): Another fix for attaching the DiB3000MC
authorPatrick Boettcher <pb@linuxtv.org>
Thu, 3 Aug 2006 09:04:16 +0000 (06:04 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 26 Sep 2006 14:53:48 +0000 (11:53 -0300)
Another stupid fix for attaching the DiB3000MC. == 0 instead of != 0.

Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/dvb-usb/dibusb-common.c

index 6723c15..ead1f7a 100644 (file)
@@ -230,19 +230,16 @@ static struct dib3000mc_config mod3000p_dib3000p_config = {
 
 int dibusb_dib3000mc_frontend_attach(struct dvb_usb_device *d)
 {
-       int ret;
-       if ((ret = dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000P_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe)) != 0)
-               return ret;
-
-       if ((ret = dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000MC_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe)) != 0)
-               return ret;
-
-       if (d->priv != NULL) {
-               struct dibusb_state *st = d->priv;
-               st->ops.pid_parse = dib3000mc_pid_parse;
-               st->ops.pid_ctrl  = dib3000mc_pid_control;
+       if (dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000P_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe) == 0 ||
+               dib3000mc_attach(&d->i2c_adap, 1, DEFAULT_DIB3000MC_I2C_ADDRESS, 0, &mod3000p_dib3000p_config, &d->fe) == 0) {
+               if (d->priv != NULL) {
+                       struct dibusb_state *st = d->priv;
+                       st->ops.pid_parse = dib3000mc_pid_parse;
+                       st->ops.pid_ctrl  = dib3000mc_pid_control;
+               }
+               return 0;
        }
-       return 0;
+       return -ENODEV;
 }
 EXPORT_SYMBOL(dibusb_dib3000mc_frontend_attach);