Merge tag 'for-linus' of git://github.com/realmz/blackfin-linux

[~andy/linux] / drivers / i2c / muxes / i2c-mux-gpio.c

diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index abc2e55aa243af75126f184a57a573b4c74c379c..5a0ce0081dce415b14cd1d40662845fb99c0f7d4 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -201,10 +201,21 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
 
        for (i = 0; i < mux->data.n_gpios; i++) {
                ret = gpio_request(gpio_base + mux->data.gpios[i], "i2c-mux-gpio");
-               if (ret)
+               if (ret) {
+                       dev_err(&pdev->dev, "Failed to request GPIO %d\n",
+                               mux->data.gpios[i]);
                        goto err_request_gpio;
-               gpio_direction_output(gpio_base + mux->data.gpios[i],
-                                     initial_state & (1 << i));
+               }
+
+               ret = gpio_direction_output(gpio_base + mux->data.gpios[i],
+                                           initial_state & (1 << i));
+               if (ret) {
+                       dev_err(&pdev->dev,
+                               "Failed to set direction of GPIO %d to output\n",
+                               mux->data.gpios[i]);
+                       i++;    /* gpio_request above succeeded, so must free */
+                       goto err_request_gpio;
+               }
        }
 
        for (i = 0; i < mux->data.n_values; i++) {