Merge tag 'mmc-v4.3' of git://git.linaro.org/people/ulf.hansson/mmc

[firefly-linux-kernel-4.4.55.git] / drivers / iio / magnetometer / bmc150_magn.c

diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
index e330205f81947589a06d5a83232696a0613bbd1f..d8e614ca069fe7e3d55da67464be889a64e8af64 100644 (file)
--- a/drivers/iio/magnetometer/bmc150_magn.c
+++ b/drivers/iio/magnetometer/bmc150_magn.c
@@ -845,16 +845,12 @@ static int bmc150_magn_gpio_probe(struct i2c_client *client)
        dev = &client->dev;
 
        /* data ready GPIO interrupt pin */
-       gpio = devm_gpiod_get_index(dev, BMC150_MAGN_GPIO_INT, 0);
+       gpio = devm_gpiod_get_index(dev, BMC150_MAGN_GPIO_INT, 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);