Merge branch 'for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[mirror_ubuntu-hirsute-kernel.git] / drivers / mfd / ucb1x00-core.c

diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index e0dd83fb95d3be8933a86b28a90c65f16c375158..bcafe1ecd71cd4c4fc9492a2cd9db64068f28ff3 100644 (file)
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -570,7 +570,7 @@ static int ucb1x00_probe(struct mcp *mcp)
 
        if (pdata && pdata->gpio_base) {
                ucb->gpio.label = dev_name(&ucb->dev);
-               ucb->gpio.dev = &ucb->dev;
+               ucb->gpio.parent = &ucb->dev;
                ucb->gpio.owner = THIS_MODULE;
                ucb->gpio.base = pdata->gpio_base;
                ucb->gpio.ngpio = 10;