diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2017-04-16 21:44:37 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2017-04-16 21:44:37 +0200 |
commit | 69e620f866c983d59d7d41d74a08d39528161473 (patch) | |
tree | 954f15bbbc060ea97a32d2ddf649693c86a84e62 /drivers/i2c/muxes/i2c-mux-gpio.c | |
parent | cda816d163e08abb698f10ec32aa2d173ad93e7f (diff) | |
parent | dbed8a803bd3fb64339a6180adaff2cec46242ce (diff) | |
download | talos-obmc-linux-69e620f866c983d59d7d41d74a08d39528161473.tar.gz talos-obmc-linux-69e620f866c983d59d7d41d74a08d39528161473.zip |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.12
Pull in changes from the i2c-mux subsubsystem:
"Here are a new LTC4306/5 driver, a fix needed by the RT kernel and some
error message cleanup."
Diffstat (limited to 'drivers/i2c/muxes/i2c-mux-gpio.c')
-rw-r--r-- | drivers/i2c/muxes/i2c-mux-gpio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index 655684d621a4..1a9973ede443 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -245,10 +245,8 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev) unsigned int class = mux->data.classes ? mux->data.classes[i] : 0; ret = i2c_mux_add_adapter(muxc, nr, mux->data.values[i], class); - if (ret) { - dev_err(&pdev->dev, "Failed to add adapter %d\n", i); + if (ret) goto add_adapter_failed; - } } dev_info(&pdev->dev, "%d port mux on %s adapter\n", |