Merge branches 'pm-opp' and 'pm-cpufreq-fixes'

[mirror_ubuntu-bionic-kernel.git] / drivers / input / misc / gpio-beeper.c

diff --git a/drivers/input/misc/gpio-beeper.c b/drivers/input/misc/gpio-beeper.c
index 4817c5f0c3e436a30bb831ea5ead9e852fd1256b..16272fffeb7ebeb4102255fdfb86acd91094ff78 100644 (file)
--- a/drivers/input/misc/gpio-beeper.c
+++ b/drivers/input/misc/gpio-beeper.c
@@ -66,13 +66,12 @@ static int gpio_beeper_probe(struct platform_device *pdev)
 {
        struct gpio_beeper *beep;
        struct input_dev *input;
-       int err;
 
        beep = devm_kzalloc(&pdev->dev, sizeof(*beep), GFP_KERNEL);
        if (!beep)
                return -ENOMEM;
 
-       beep->desc = devm_gpiod_get(&pdev->dev, NULL);
+       beep->desc = devm_gpiod_get(&pdev->dev, NULL, GPIOD_OUT_LOW);
        if (IS_ERR(beep->desc))
                return PTR_ERR(beep->desc);
 
@@ -92,10 +91,6 @@ static int gpio_beeper_probe(struct platform_device *pdev)
 
        input_set_capability(input, EV_SND, SND_BELL);
 
-       err = gpiod_direction_output(beep->desc, 0);
-       if (err)
-               return err;
-
        input_set_drvdata(input, beep);
 
        return input_register_device(input);