diff options
| author |   Linus Walleij <linus.walleij@linaro.org> | 2018-10-01 13:20:45 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2018-10-01 13:20:45 +0200 |
| commit | 30aa69e7bd9f7af3574120249eecb3726dcaf737 (patch) | |
| tree | b4a9ec1374ec9aed1022fdb32802c483952e5a97 /drivers/pinctrl/cirrus | |
| parent | pinctrl: sprd: Move DT parsing before registering pinctrl device (diff) | |
| parent | Linux 4.19-rc6 (diff) | |
| download | linux-dev-30aa69e7bd9f7af3574120249eecb3726dcaf737.tar.xz linux-dev-30aa69e7bd9f7af3574120249eecb3726dcaf737.zip | |
Merge tag 'v4.19-rc6' into devel
This is the 4.19-rc6 release
I needed to merge this in because of extensive conflicts in
the MSM and Intel pin control drivers. I know how to resolve
them, so let's do it like this.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/cirrus')
| -rw-r--r-- | drivers/pinctrl/cirrus/pinctrl-madera-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/cirrus/pinctrl-madera-core.c b/drivers/pinctrl/cirrus/pinctrl-madera-core.c index 979df109e187..0266302ae2cf 100644 --- a/drivers/pinctrl/cirrus/pinctrl-madera-core.c +++ b/drivers/pinctrl/cirrus/pinctrl-madera-core.c @@ -1040,7 +1040,7 @@ static int madera_pin_probe(struct platform_device *pdev) } /* if the configuration is provided through pdata, apply it */ - if (pdata) { + if (pdata && pdata->gpio_configs) { ret = pinctrl_register_mappings(pdata->gpio_configs, pdata->n_gpio_configs); if (ret) { |