diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 13:31:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-04 13:31:26 -0400 |
| commit | dd0888c264c0d5feb5d86eb69c1fdbcdb42566af (patch) | |
| tree | d224f6e96bc29b9a9dc3b2f60cb2f8808d41844e /drivers/mfd/sm501.c | |
| parent | 14c1b7c212de7c7c9231d5a676eb96f28c088338 (diff) | |
| parent | 1c90ea2c7eb3b24a07a2f82164323588fb029bc1 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:
mfd: fix pcap adc locking
mfd: sm501, fix lock imbalance
Diffstat (limited to 'drivers/mfd/sm501.c')
| -rw-r--r-- | drivers/mfd/sm501.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index 4c7b7962f6b8..0cc5eeff5ee8 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
| @@ -367,7 +367,8 @@ int sm501_unit_power(struct device *dev, unsigned int unit, unsigned int to) | |||
| 367 | break; | 367 | break; |
| 368 | 368 | ||
| 369 | default: | 369 | default: |
| 370 | return -1; | 370 | gate = -1; |
| 371 | goto already; | ||
| 371 | } | 372 | } |
| 372 | 373 | ||
| 373 | writel(mode, sm->regs + SM501_POWER_MODE_CONTROL); | 374 | writel(mode, sm->regs + SM501_POWER_MODE_CONTROL); |