From 2b9845555dcad3fc345369d1086cdd32388f2be9 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Fri, 25 Jul 2008 01:46:03 -0700 Subject: [PATCH] --- yaml --- r: 105828 b: refs/heads/master c: 53a9600c634e3bfd6230e0597aca159bf4d4d010 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/sm501.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 93770d2e39b6..7da390ee2e25 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2999209d779573e17468b680f5f267d8cb2a9c7 +refs/heads/master: 53a9600c634e3bfd6230e0597aca159bf4d4d010 diff --git a/trunk/drivers/mfd/sm501.c b/trunk/drivers/mfd/sm501.c index 79d7aea5510b..7aebad4c06ff 100644 --- a/trunk/drivers/mfd/sm501.c +++ b/trunk/drivers/mfd/sm501.c @@ -1108,7 +1108,9 @@ static void sm501_gpio_remove(struct sm501_devdata *sm) static inline int sm501_gpio_pin2nr(struct sm501_devdata *sm, unsigned int pin) { struct sm501_gpio *gpio = &sm->gpio; - return pin + (pin < 32) ? gpio->low.gpio.base : gpio->high.gpio.base; + int base = (pin < 32) ? gpio->low.gpio.base : gpio->high.gpio.base; + + return (pin % 32) + base; } static inline int sm501_gpio_isregistered(struct sm501_devdata *sm)