diff options
author | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-01-12 21:59:19 +0300 |
commit | 9d66a875ecc7d6dd414121e4508340d6c08f51b0 (patch) | |
tree | d446bb455780d9058efe1760745bfb63207090de /drivers/pinctrl/pinctrl-gemini.c | |
parent | 987da3fe175933c28aab2293505c3597052ff0e2 (diff) | |
parent | dd1dbf94d2826a045fbbe2649d84b27d48620d56 (diff) | |
download | linux-9d66a875ecc7d6dd414121e4508340d6c08f51b0.tar.xz |
Merge branch 'acpi-gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-intel
Diffstat (limited to 'drivers/pinctrl/pinctrl-gemini.c')
-rw-r--r-- | drivers/pinctrl/pinctrl-gemini.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-gemini.c b/drivers/pinctrl/pinctrl-gemini.c index e9b83e291edf..c11b8f14d841 100644 --- a/drivers/pinctrl/pinctrl-gemini.c +++ b/drivers/pinctrl/pinctrl-gemini.c @@ -2322,7 +2322,7 @@ static const struct gemini_pin_conf *gemini_get_pin_conf(struct gemini_pmx *pmx, int i; for (i = 0; i < pmx->nconfs; i++) { - retconf = &gemini_confs_3516[i]; + retconf = &pmx->confs[i]; if (retconf->pin == pin) return retconf; } |