Merge tag 'v4.2-rc4' into devel

[karo-tx-linux.git] / drivers / iio / light / stk3310.c

diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c
index 11a027adc204aeb630c66707eaf9d5d0ce169ebb..48ff7942fa00af7d96998731236c5f84c0500e38 100644 (file)
--- a/drivers/iio/light/stk3310.c
+++ b/drivers/iio/light/stk3310.c
@@ -469,16 +469,12 @@ static int stk3310_gpio_probe(struct i2c_client *client)
        dev = &client->dev;
 
        /* gpio interrupt pin */
-       gpio = devm_gpiod_get_index(dev, STK3310_GPIO, 0);
+       gpio = devm_gpiod_get_index(dev, STK3310_GPIO, 0, GPIOD_IN);
        if (IS_ERR(gpio)) {
                dev_err(dev, "acpi gpio get index failed\n");
                return PTR_ERR(gpio);
        }
 
-       ret = gpiod_direction_input(gpio);
-       if (ret)
-               return ret;
-
        ret = gpiod_to_irq(gpio);
        dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret);