diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:01:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 13:01:06 -0400 |
| commit | e83ddb335468cdd9ea6e9767eb30b64d8ff176ce (patch) | |
| tree | af7ca0b5be74b713970149efaebe682596523252 /drivers/mfd/t7l66xb.c | |
| parent | 14a4fa20a10d76eb98b7feb25be60735217929ba (diff) | |
| parent | d0a11693967295772d2a7c22b6b37eb20684e709 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (40 commits)
mfd: Fix incorrect kfree(i2c) in wm8994-core i2c_driver probe
mfd: Fix incorrect kfree(i2c) in wm831x-core i2c_driver probe
mfd: Fix incorrect kfree(i2c) in tps6507x i2c_driver probe
mfd: Add TPS6586x driver
mfd: Use macros instead of some constant magic numbers for menelaus
mfd: Fix menelaus mmc slot 2 misconfiguration
mfd: Missing slab.h includes
mfd: Fix wrong wm8350-core kfree in error path
mfd: Fix wm8994_device_init() return value
mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path
mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit
mfd: Fix tc6387xb resource reclaim
mfd: Fix wrong goto labels for tc6393xb error handling
mfd: Get rid of now unused mc13783 private header
hwmon: Don't access struct mc13783 directly from mc13783-adc
mfd: New mc13783 function exposing flags
mfd: Check jz4740-adc kmalloc() result
mfd: Fix jz4740-adc resource reclaim in probe error path
mfd: Add WM8321 support
mfd: Add stmpe auto sleep feature
...
Diffstat (limited to 'drivers/mfd/t7l66xb.c')
| -rw-r--r-- | drivers/mfd/t7l66xb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 5041d33adf0b..006c121f3f0d 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c | |||
| @@ -350,7 +350,6 @@ static int t7l66xb_probe(struct platform_device *dev) | |||
| 350 | t7l66xb->clk48m = clk_get(&dev->dev, "CLK_CK48M"); | 350 | t7l66xb->clk48m = clk_get(&dev->dev, "CLK_CK48M"); |
| 351 | if (IS_ERR(t7l66xb->clk48m)) { | 351 | if (IS_ERR(t7l66xb->clk48m)) { |
| 352 | ret = PTR_ERR(t7l66xb->clk48m); | 352 | ret = PTR_ERR(t7l66xb->clk48m); |
| 353 | clk_put(t7l66xb->clk32k); | ||
| 354 | goto err_clk48m_get; | 353 | goto err_clk48m_get; |
| 355 | } | 354 | } |
| 356 | 355 | ||
| @@ -425,6 +424,8 @@ static int t7l66xb_remove(struct platform_device *dev) | |||
| 425 | ret = pdata->disable(dev); | 424 | ret = pdata->disable(dev); |
| 426 | clk_disable(t7l66xb->clk48m); | 425 | clk_disable(t7l66xb->clk48m); |
| 427 | clk_put(t7l66xb->clk48m); | 426 | clk_put(t7l66xb->clk48m); |
| 427 | clk_disable(t7l66xb->clk32k); | ||
| 428 | clk_put(t7l66xb->clk32k); | ||
| 428 | t7l66xb_detach_irq(dev); | 429 | t7l66xb_detach_irq(dev); |
| 429 | iounmap(t7l66xb->scr); | 430 | iounmap(t7l66xb->scr); |
| 430 | release_resource(&t7l66xb->rscr); | 431 | release_resource(&t7l66xb->rscr); |