diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2018-12-07 13:42:35 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2018-12-07 13:42:35 +0100 |
| commit | 0cef02031e74e1ea689b18fb8f0b0e87e0051f03 (patch) | |
| tree | 837e8a7244c6df8b5eee80038e4593f84243397c /drivers | |
| parent | 34812fe1111929be454afb9a63f2c69e834c2d9a (diff) | |
| parent | 3f3327dbc5596076f94695d8d4cc66da3d5027fb (diff) | |
| download | linux-0cef02031e74e1ea689b18fb8f0b0e87e0051f03.tar.bz2 | |
Merge tag 'sh-pfc-for-v4.21-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: sh-pfc: Updates for v4.21 (take two)
- Two small fixes for RZ/N1.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pinctrl/pinctrl-rzn1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pinctrl/pinctrl-rzn1.c b/drivers/pinctrl/pinctrl-rzn1.c index 57886dcff53d..cc0e5aa9128a 100644 --- a/drivers/pinctrl/pinctrl-rzn1.c +++ b/drivers/pinctrl/pinctrl-rzn1.c @@ -112,7 +112,7 @@ struct rzn1_pinctrl { struct rzn1_pinctrl_regs __iomem *lev2; u32 lev1_protect_phys; u32 lev2_protect_phys; - u32 mdio_func[2]; + int mdio_func[2]; struct rzn1_pin_group *groups; unsigned int ngroups; @@ -810,8 +810,8 @@ static int rzn1_pinctrl_probe_dt(struct platform_device *pdev, struct device_node *np = pdev->dev.of_node; struct device_node *child; unsigned int maxgroups = 0; - unsigned int nfuncs = 0; unsigned int i = 0; + int nfuncs = 0; int ret; nfuncs = of_get_child_count(np); |