Merge tag 'gpio-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[linux-2.6-block.git] / sound / soc / codecs / wm8962.c

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 949f632fc3f85653ee9d1a7995839dadf5aeadf7..88223608a33f270adbcbec29e69385aba8b147f2 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3379,7 +3379,7 @@ static void wm8962_init_gpio(struct snd_soc_codec *codec)
 
        wm8962->gpio_chip = wm8962_template_chip;
        wm8962->gpio_chip.ngpio = WM8962_MAX_GPIO;
-       wm8962->gpio_chip.dev = codec->dev;
+       wm8962->gpio_chip.parent = codec->dev;
 
        if (pdata->gpio_base)
                wm8962->gpio_chip.base = pdata->gpio_base;