From 321ca5ee4533bb6deee0f19b5adf46e490466643 Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Wed, 20 Sep 2006 04:42:23 -0300 Subject: [PATCH] --- yaml --- r: 38247 b: refs/heads/master c: 1d57436040a7ff486fb90a82b6f542fbe275f624 h: refs/heads/master i: 38245: 5505ddde43aed664022c38a8694479d95eba56cc 38243: b52fcb483eb94f1612351301d0ea258be5f6dc4f 38239: 51adcc7d3f0519992bc99fa7dca56a24fb725e12 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/dibusb-common.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e96c6e5fa81f..6566fbf3ddbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b97c5c7e6cc9ab1d2bb590db094b8534410deca3 +refs/heads/master: 1d57436040a7ff486fb90a82b6f542fbe275f624 diff --git a/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c b/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c index b4d6e539ff5a..76e37b5d6610 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c +++ b/trunk/drivers/media/dvb/dvb-usb/dibusb-common.c @@ -230,8 +230,8 @@ static struct dib3000mc_config mod3000p_dib3000p_config = { int dibusb_dib3000mc_frontend_attach(struct dvb_usb_adapter *adap) { - if ((adap->fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000P_I2C_ADDRESS, &mod3000p_dib3000p_config)) == NULL || - (adap->fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000MC_I2C_ADDRESS, &mod3000p_dib3000p_config)) == NULL) { + if ((adap->fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000P_I2C_ADDRESS, &mod3000p_dib3000p_config)) != NULL || + (adap->fe = dvb_attach(dib3000mc_attach, &adap->dev->i2c_adap, DEFAULT_DIB3000MC_I2C_ADDRESS, &mod3000p_dib3000p_config)) != NULL) { if (adap->priv != NULL) { struct dibusb_state *st = adap->priv; st->ops.pid_parse = dib3000mc_pid_parse;