From d625034ad9c39ea1a790f0f48c49127c27a53df8 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 1 Feb 2013 13:05:05 +0100 Subject: [PATCH] --- yaml --- r: 350514 b: refs/heads/master c: d8a7c1f134edda4ac17a99fffc1159a65a3866a7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-lantiq.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f5e2cb05ee76..b62716484435 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c58bdc36bc111cf3d8f1a27b68899ea3caf2e12b +refs/heads/master: d8a7c1f134edda4ac17a99fffc1159a65a3866a7 diff --git a/trunk/drivers/pinctrl/pinctrl-lantiq.c b/trunk/drivers/pinctrl/pinctrl-lantiq.c index 7d110722dfd1..a70384611351 100644 --- a/trunk/drivers/pinctrl/pinctrl-lantiq.c +++ b/trunk/drivers/pinctrl/pinctrl-lantiq.c @@ -294,7 +294,7 @@ static int ltq_pmx_gpio_request_enable(struct pinctrl_dev *pctrldev, unsigned pin) { struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctrldev); - int mfp = match_mfp(info, pin + (range->id * 32)); + int mfp = match_mfp(info, pin); int pin_func; if (mfp < 0) {