Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i2c: mux: reg: put away the parent i2c adapter on probe failure

Browse source 
It is only prudent to let go of resources that are not used.

Fixes: b3fdd32799 ("i2c: mux: Add register-based mux i2c-mux-reg")
Signed-off-by: Peter Rosin <peda@axentia.se>
This commit is contained in:
Peter Rosin 2017-05-07 07:16:30 +02:00
parent 2ea659a9ef
commit 68118e0e73
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/i2c/muxes/i2c-mux-reg.c
View file

@ -196,20 +196,25 @@ static int i2c_mux_reg_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mux->data.reg_size = resource_size(res); mux->data.reg_size = resource_size(res);
mux->data.reg = devm_ioremap_resource(&pdev->dev, res); mux->data.reg = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mux->data.reg)) if (IS_ERR(mux->data.reg)) {
return PTR_ERR(mux->data.reg); ret = PTR_ERR(mux->data.reg);
goto err_put_parent;
}
} }
if (mux->data.reg_size != 4 && mux->data.reg_size != 2 && if (mux->data.reg_size != 4 && mux->data.reg_size != 2 &&
mux->data.reg_size != 1) { mux->data.reg_size != 1) {
dev_err(&pdev->dev, "Invalid register size\n"); dev_err(&pdev->dev, "Invalid register size\n");
return -EINVAL; ret = -EINVAL;
goto err_put_parent;
} }
muxc = i2c_mux_alloc(parent, &pdev->dev, mux->data.n_values, 0, 0, muxc = i2c_mux_alloc(parent, &pdev->dev, mux->data.n_values, 0, 0,
i2c_mux_reg_select, NULL); i2c_mux_reg_select, NULL);
if (!muxc) if (!muxc) {
return -ENOMEM; ret = -ENOMEM;
goto err_put_parent;
}
muxc->priv = mux; muxc->priv = mux;
platform_set_drvdata(pdev, muxc); platform_set_drvdata(pdev, muxc);
@ -233,6 +238,8 @@ static int i2c_mux_reg_probe(struct platform_device *pdev)
add_adapter_failed: add_adapter_failed:
i2c_mux_del_adapters(muxc); i2c_mux_del_adapters(muxc);
err_put_parent:
i2c_put_adapter(parent);
return ret; return ret;
} }