summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-12-07 13:32:28 +0100
committerLinus Walleij <linus.walleij@linaro.org>2015-12-07 13:32:28 +0100
commita1eb9d5751220433998ae2e66216288161b1355b (patch)
tree85360a4caed471999f3ad13d3f43df758a9fcac4 /sound
parentMerge tag 'asoc-ac97-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/b... (diff)
downloadlinux-a1eb9d5751220433998ae2e66216288161b1355b.tar.xz
linux-a1eb9d5751220433998ae2e66216288161b1355b.zip
ASoC: ac97: fix parent assignment
Upstream GPIO has substituted .dev for .parent in struct gpio_chip. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-ac97.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-ac97.c b/sound/soc/soc-ac97.c
index ae563e379a72..a2012652f212 100644
--- a/sound/soc/soc-ac97.c
+++ b/sound/soc/soc-ac97.c
@@ -142,7 +142,7 @@ static int snd_soc_ac97_init_gpio(struct snd_ac97 *ac97,
gpio_priv->codec = codec;
gpio_priv->gpio_chip = snd_soc_ac97_gpio_chip;
gpio_priv->gpio_chip.ngpio = AC97_NUM_GPIOS;
- gpio_priv->gpio_chip.dev = codec->dev;
+ gpio_priv->gpio_chip.parent = codec->dev;
gpio_priv->gpio_chip.base = -1;
ret = gpiochip_add(&gpio_priv->gpio_chip);