From 0744d99582352a92a07711cdc89c3fae9394b4d7 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 1 Feb 2013 13:04:59 +0100 Subject: [PATCH] --- yaml --- r: 350509 b: refs/heads/master c: 933862873740923a059cbcda0c66487c6179ba3c h: refs/heads/master i: 350507: b51e83dd6e3553c0d746af907fd5564059fd470c v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/pinctrl-xway.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 43680e1e67df..cdd5c0044c81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6360350cbc0567f51afacb2d1e6a8e611b3b9b2b +refs/heads/master: 933862873740923a059cbcda0c66487c6179ba3c diff --git a/trunk/drivers/pinctrl/pinctrl-xway.c b/trunk/drivers/pinctrl/pinctrl-xway.c index b23b8954ae31..53cb6a3a56ed 100644 --- a/trunk/drivers/pinctrl/pinctrl-xway.c +++ b/trunk/drivers/pinctrl/pinctrl-xway.c @@ -494,7 +494,10 @@ static int xway_pinconf_set(struct pinctrl_dev *pctldev, reg = GPIO3_OD; else reg = GPIO_OD(pin); - gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); + if (arg == 0) + gpio_setbit(info->membase[0], reg, PORT_PIN(pin)); + else + gpio_clearbit(info->membase[0], reg, PORT_PIN(pin)); break; case LTQ_PINCONF_PARAM_PULL: