aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-12-13 16:36:20 +0100
committerJonas Gorski <jonas.gorski@gmail.com>2017-12-13 16:40:47 +0100
commita8d3d517d0cf9f3d5a651091cfd193f3e7a454ce (patch)
tree97522168a75bea3a703104d0befee7bc0b1c3bc1
parentef1f6092e0ec889b105c4c22cf2a0df1bde99d00 (diff)
downloadupstream-a8d3d517d0cf9f3d5a651091cfd193f3e7a454ce.tar.gz
upstream-a8d3d517d0cf9f3d5a651091cfd193f3e7a454ce.tar.bz2
upstream-a8d3d517d0cf9f3d5a651091cfd193f3e7a454ce.zip
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 <jonas.gorski@gmail.com>
-rw-r--r--target/linux/brcm63xx/patches-4.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch2
1 files changed, 1 insertions, 1 deletions
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 <jonas.gorski@gmail.com>
+ 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);
+