[media] b2c2: Reset no_base_addr on skystarS2 attach failure

[firefly-linux-kernel-4.4.55.git] / drivers / media / common / b2c2 / flexcop-fe-tuner.c

diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c
index 9305266d0ac073495edfa585660b274de25bad9d..2426062fcb3cfd576aaee60d1f4179f6715eefcd 100644 (file)
--- a/drivers/media/common/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/common/b2c2/flexcop-fe-tuner.c
@@ -637,15 +637,16 @@ static int skystarS2_rev33_attach(struct flexcop_device *fc,
        struct i2c_adapter *i2c)
 {
        fc->fe = dvb_attach(cx24120_attach,
-               &skystar2_rev3_3_cx24120_config, i2c);
-       if (fc->fe == NULL)
+                           &skystar2_rev3_3_cx24120_config, i2c);
+       if (!fc->fe)
                return 0;
 
        fc->dev_type = FC_SKYS2_REV33;
        fc->fc_i2c_adap[2].no_base_addr = 1;
-       if ((dvb_attach(isl6421_attach, fc->fe,
-               &fc->fc_i2c_adap[2].i2c_adap, 0x08, 0, 0, false) == NULL)) {
+       if (!dvb_attach(isl6421_attach, fc->fe, &fc->fc_i2c_adap[2].i2c_adap,
+                       0x08, 0, 0, false)) {
                err("ISL6421 could NOT be attached!");
+               fc->fc_i2c_adap[2].no_base_addr = 0;
                return 0;
        }
        info("ISL6421 successfully attached.");