aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/muxes
diff options
context:
space:
mode:
authorPeter Rosin <peda@axentia.se>2017-05-15 18:48:55 +0200
committerPeter Rosin <peda@axentia.se>2017-05-15 18:49:10 +0200
commita36d4637e4a06be067b8e327a0b1118bb2a73cb8 (patch)
treef12d6f64ad6c815973c130eb6dbfd354e60da9a6 /drivers/i2c/muxes
parenti2c: mux: reg: put away the parent i2c adapter on probe failure (diff)
downloadlinux-dev-a36d4637e4a06be067b8e327a0b1118bb2a73cb8.tar.xz
linux-dev-a36d4637e4a06be067b8e327a0b1118bb2a73cb8.zip
i2c: mux: reg: rename label to indicate what it does
That maintains sanity if it is ever called from some other spot, and also makes the label names coherent. Signed-off-by: Peter Rosin <peda@axentia.se>
Diffstat (limited to 'drivers/i2c/muxes')
-rw-r--r--drivers/i2c/muxes/i2c-mux-reg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index 11974e3cd1e5..d97031804de8 100644
--- a/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@ -228,7 +228,7 @@ static int i2c_mux_reg_probe(struct platform_device *pdev)
ret = i2c_mux_add_adapter(muxc, nr, mux->data.values[i], class);
if (ret)
- goto add_adapter_failed;
+ goto err_del_mux_adapters;
}
dev_dbg(&pdev->dev, "%d port mux on %s adapter\n",
@@ -236,7 +236,7 @@ static int i2c_mux_reg_probe(struct platform_device *pdev)
return 0;
-add_adapter_failed:
+err_del_mux_adapters:
i2c_mux_del_adapters(muxc);
err_put_parent:
i2c_put_adapter(parent);