From 6a8345926ca569d0498b5cd2cb878a9147ca114a Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Thu, 3 Aug 2006 06:04:16 -0300 Subject: [PATCH] --- yaml --- r: 37390 b: refs/heads/master c: 0f69e7f3f5256ab392fc44e7340777348b5da2cd h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/media/dvb/dvb-usb/dibusb-common.c | 21 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index fa290c29dd67..085199352178 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e66c97c9299d53f1d9167e42b05357f023099c8 +refs/heads/master: 0f69e7f3f5256ab392fc44e7340777348b5da2cd diff --git a/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c b/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c index 6723c153e3f4..ead1f7a4dc00 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -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);