Merge remote-tracking branch 'asoc/fix/wm0010' into asoc-linus

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / ucb1400_core.c

diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c
index daf69527ed83dc6e3c883c75f2fa55383887448d..e9031fa9d53d1983e0dfe5ee5307bf8d24f79857 100644 (file)
--- a/drivers/mfd/ucb1400_core.c
+++ b/drivers/mfd/ucb1400_core.c
@@ -75,6 +75,11 @@ static int ucb1400_core_probe(struct device *dev)
 
        /* GPIO */
        ucb_gpio.ac97 = ac97;
+       if (pdata) {
+               ucb_gpio.gpio_setup = pdata->gpio_setup;
+               ucb_gpio.gpio_teardown = pdata->gpio_teardown;
+               ucb_gpio.gpio_offset = pdata->gpio_offset;
+       }
        ucb->ucb1400_gpio = platform_device_alloc("ucb1400_gpio", -1);
        if (!ucb->ucb1400_gpio) {
                err = -ENOMEM;