Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / sound / soc / jz4740 / qi_lb60.c

diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 0846917..5358699 100644 (file)
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -77,25 +77,18 @@ static int qi_lb60_probe(struct platform_device *pdev)
 {
        struct qi_lb60 *qi_lb60;
        struct snd_soc_card *card = &qi_lb60_card;
-       int ret;
 
        qi_lb60 = devm_kzalloc(&pdev->dev, sizeof(*qi_lb60), GFP_KERNEL);
        if (!qi_lb60)
                return -ENOMEM;
 
-       qi_lb60->snd_gpio = devm_gpiod_get(&pdev->dev, "snd");
+       qi_lb60->snd_gpio = devm_gpiod_get(&pdev->dev, "snd", GPIOD_OUT_LOW);
        if (IS_ERR(qi_lb60->snd_gpio))
                return PTR_ERR(qi_lb60->snd_gpio);
-       ret = gpiod_direction_output(qi_lb60->snd_gpio, 0);
-       if (ret)
-               return ret;
 
-       qi_lb60->amp_gpio = devm_gpiod_get(&pdev->dev, "amp");
+       qi_lb60->amp_gpio = devm_gpiod_get(&pdev->dev, "amp", GPIOD_OUT_LOW);
        if (IS_ERR(qi_lb60->amp_gpio))
                return PTR_ERR(qi_lb60->amp_gpio);
-       ret = gpiod_direction_output(qi_lb60->amp_gpio, 0);
-       if (ret)
-               return ret;
 
        card->dev = &pdev->dev;