From f99a75cb235fe01e33703b3936ed4dcd30aa34e3 Mon Sep 17 00:00:00 2001 From: Jemma Denson Date: Fri, 15 May 2015 15:40:29 -0300 Subject: [PATCH] [media] b2c2: Reset no_base_addr on skystarS2 attach failure If set, all the other drivers reset no_base_addr on failure to attach - git commit for this being added to some of them seems to be 797806908814846c07973950dc328045061d805f This driver has been floating around outside the mainline for so long it hasn't had this fix, so add it in. Whilst here tidy surrounding code to fix style issues. Signed-off-by: Jemma Denson Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab --- drivers/media/common/b2c2/flexcop-fe-tuner.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/media/common/b2c2/flexcop-fe-tuner.c b/drivers/media/common/b2c2/flexcop-fe-tuner.c index 9305266d0ac07..2426062fcb3cf 100644 --- 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."); -- 2.39.5