From: Jonas Gorski Date: Wed, 13 Dec 2017 15:36:20 +0000 (+0100) Subject: brcm63xx: fix an OOPS when accessing the basemode register on 6368 X-Git-Tag: v18.06.0-rc1~1585 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8d3d517d0cf9f3d5a651091cfd193f3e7a454ce;p=oweals%2Fopenwrt.git brcm63xx: fix an OOPS when accessing the basemode register on 6368 The bcm6368 pinctrl driver passed the wrong variable to devm_regmap_field_alloc, causing it to blow up when later trying to access the field. Fixes #1211. Signed-off-by: Jonas Gorski --- diff --git a/target/linux/brcm63xx/patches-4.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch b/target/linux/brcm63xx/patches-4.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch index 9d086a65f2..6a9b9e0807 100644 --- a/target/linux/brcm63xx/patches-4.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch +++ b/target/linux/brcm63xx/patches-4.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch @@ -575,7 +575,7 @@ Signed-off-by: Jonas Gorski + if (!pctl) + return -ENOMEM; + -+ pctl->overlay = devm_regmap_field_alloc(&pdev->dev, mode, overlay); ++ pctl->overlay = devm_regmap_field_alloc(&pdev->dev, basemode, overlay); + if (IS_ERR(pctl->overlay)) + return PTR_ERR(pctl->overlay); +