Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / drivers / power / bq25890_charger.c

diff --git a/drivers/power/bq25890_charger.c b/drivers/power/bq25890_charger.c
index 16b7c7bc987dc46177c1b5e17fbe81b9443a7809..f993a55cde20f34a00d60d46b762e37ecef7af64 100644 (file)
--- a/drivers/power/bq25890_charger.c
+++ b/drivers/power/bq25890_charger.c
@@ -721,19 +721,14 @@ static int bq25890_usb_notifier(struct notifier_block *nb, unsigned long val,
 
 static int bq25890_irq_probe(struct bq25890_device *bq)
 {
-       int ret;
        struct gpio_desc *irq;
 
-       irq = devm_gpiod_get_index(bq->dev, BQ25890_IRQ_PIN, 0);
+       irq = devm_gpiod_get_index(bq->dev, BQ25890_IRQ_PIN, 0, GPIOD_IN);
        if (IS_ERR(irq)) {
                dev_err(bq->dev, "Could not probe irq pin.\n");
                return PTR_ERR(irq);
        }
 
-       ret = gpiod_direction_input(irq);
-       if (ret < 0)
-               return ret;
-
        return gpiod_to_irq(irq);
 }