Patch "i2c: mux: reg: put away the parent i2c adapter on probe failure" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
i2c: mux: reg: put away the parent i2c adapter on probe failure
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
i2c-mux-reg-put-away-the-parent-i2c-adapter-on-probe-failure.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 17:09:24 CEST 2018
From: Peter Rosin <[email protected]>
Date: Sun, 7 May 2017 07:16:30 +0200
Subject: i2c: mux: reg: put away the parent i2c adapter on probe failure
From: Peter Rosin <[email protected]>
[ Upstream commit 68118e0e73aa3a6291c8b9eb1ee708e05f110cea ]
It is only prudent to let go of resources that are not used.
--- drivers/i2c/muxes/i2c-mux-reg.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/i2c/muxes/i2c-mux-reg.c +12 -5
@@ -196,20 +196,25 @@ static int i2c_mux_reg_probe(struct plat res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); mux->data.reg_size =resource_size (res); mux->data.reg =devm_ioremap_resource (&pdev->dev, res); -if (IS_ERR (mux->data.reg)) -return PTR_ERR (mux->data.reg); +if (IS_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 && mux->data.reg_size !=1 ) {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 , i2c_mux_reg_select,NULL ); -if (!muxc) -return -ENOMEM ; +if (!muxc) { + ret = -ENOMEM ; + goto err_put_parent; + } muxc->priv = mux;platform_set_drvdata (pdev, muxc);
@@ -235,6 +240,8 @@ static int i2c_mux_reg_probe(struct plat add_adapter_failed:i2c_mux_del_adapters (muxc); +err_put_parent: +i2c_put_adapter (parent);return ret; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/i2c-mux-reg-put-away-the-parent-i2c-adapter-on-probe-failure.patch