diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 12:13:05 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-13 12:13:05 +0100 |
commit | a6184f8e0bb1ba8b444836926cd6967ea176fd31 (patch) | |
tree | 34a580e0122747087740436055e834f295b414e4 /drivers/gpio/gpio-mpc8xxx.c | |
parent | 477b8383100023ea0769979cff67e9be3a720397 (diff) | |
parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) |
Merge 5.5-rc6 into tty-next
We need the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpio/gpio-mpc8xxx.c')
-rw-r--r-- | drivers/gpio/gpio-mpc8xxx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index f1e164cecff8..5ae30de3490a 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c @@ -346,6 +346,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) return -ENOMEM; gc = &mpc8xxx_gc->gc; + gc->parent = &pdev->dev; if (of_property_read_bool(np, "little-endian")) { ret = bgpio_init(gc, &pdev->dev, 4, |