diff options
| author | Axel Lin <axel.lin@gmail.com> | 2010-08-03 10:34:13 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-08-12 11:28:06 +0200 |
| commit | ef256176c7ede53741ad8c0231db0cc46c0cfce5 (patch) | |
| tree | 0af2380fa30cb20b99b43b42df61ae52cfd779bc /drivers/mfd/ucb1400_core.c | |
| parent | mfd: Annotate tc6387xb probe/remove routines with __devinit/__devexit (diff) | |
| download | linux-ef256176c7ede53741ad8c0231db0cc46c0cfce5.tar.xz linux-ef256176c7ede53741ad8c0231db0cc46c0cfce5.zip | |
mfd: Avoid calling platform_device_put() twice in ucb1400 probe error path
In the case of goto err2, what we want is to call
platform_device_del() instead of platform_device_unregister().
Otherwise, we call platform_device_put() twice.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/ucb1400_core.c')
| -rw-r--r-- | drivers/mfd/ucb1400_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c index dbe280153f9e..d73f84ba0f08 100644 --- a/drivers/mfd/ucb1400_core.c +++ b/drivers/mfd/ucb1400_core.c @@ -114,7 +114,7 @@ static int ucb1400_core_probe(struct device *dev) err3: platform_device_put(ucb->ucb1400_ts); err2: - platform_device_unregister(ucb->ucb1400_gpio); + platform_device_del(ucb->ucb1400_gpio); err1: platform_device_put(ucb->ucb1400_gpio); err0: |