Commit cf4f8114 authored by Jemma Denson's avatar Jemma Denson Committed by Mauro Carvalho Chehab

[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 eccd15aa

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: default avatarJemma Denson <jdenson@gmail.com>
Signed-off-by: default avatarPatrick Boettcher <patrick.boettcher@posteo.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 4133601c
...@@ -637,15 +637,16 @@ static int skystarS2_rev33_attach(struct flexcop_device *fc, ...@@ -637,15 +637,16 @@ static int skystarS2_rev33_attach(struct flexcop_device *fc,
struct i2c_adapter *i2c) struct i2c_adapter *i2c)
{ {
fc->fe = dvb_attach(cx24120_attach, fc->fe = dvb_attach(cx24120_attach,
&skystar2_rev3_3_cx24120_config, i2c); &skystar2_rev3_3_cx24120_config, i2c);
if (fc->fe == NULL) if (!fc->fe)
return 0; return 0;
fc->dev_type = FC_SKYS2_REV33; fc->dev_type = FC_SKYS2_REV33;
fc->fc_i2c_adap[2].no_base_addr = 1; fc->fc_i2c_adap[2].no_base_addr = 1;
if ((dvb_attach(isl6421_attach, fc->fe, if (!dvb_attach(isl6421_attach, fc->fe, &fc->fc_i2c_adap[2].i2c_adap,
&fc->fc_i2c_adap[2].i2c_adap, 0x08, 0, 0, false) == NULL)) { 0x08, 0, 0, false)) {
err("ISL6421 could NOT be attached!"); err("ISL6421 could NOT be attached!");
fc->fc_i2c_adap[2].no_base_addr = 0;
return 0; return 0;
} }
info("ISL6421 successfully attached."); info("ISL6421 successfully attached.");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment