Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / mvebu / pinctrl-dove.c

diff --git a/drivers/pinctrl/mvebu/pinctrl-dove.c b/drivers/pinctrl/mvebu/pinctrl-dove.c
index 29f7e4fc7ca5a8e8e34281484f2caafbe476b74f..47268393af34689832fd189bde3c9da27eb6c090 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-dove.c
+++ b/drivers/pinctrl/mvebu/pinctrl-dove.c
@@ -335,7 +335,7 @@ static int dove_twsi_ctrl_set(struct mvebu_mpp_ctrl *ctrl,
        unsigned long gcfg2 = readl(DOVE_GLOBAL_CONFIG_2);
 
        gcfg1 &= ~DOVE_TWSI_ENABLE_OPTION1;
-       gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION2);
+       gcfg2 &= ~(DOVE_TWSI_ENABLE_OPTION2 | DOVE_TWSI_ENABLE_OPTION3);
 
        switch (config) {
        case 1:
@@ -806,7 +806,7 @@ static struct platform_driver dove_pinctrl_driver = {
        .driver = {
                .name = "dove-pinctrl",
                .owner = THIS_MODULE,
-               .of_match_table = of_match_ptr(dove_pinctrl_of_match),
+               .of_match_table = dove_pinctrl_of_match,
        },
        .probe = dove_pinctrl_probe,
        .remove = dove_pinctrl_remove,