Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105828
b: refs/heads/master
c: 53a9600
h: refs/heads/master
v: v3
  • Loading branch information
Ben Dooks authored and Linus Torvalds committed Jul 25, 2008
1 parent 512ee29 commit 2b98455
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2999209d779573e17468b680f5f267d8cb2a9c7
refs/heads/master: 53a9600c634e3bfd6230e0597aca159bf4d4d010
4 changes: 3 additions & 1 deletion trunk/drivers/mfd/sm501.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 2b98455

Please sign in to comment.