2010-08-03 08:33:07

by Axel Lin

Subject: [PATCH] ucb1400_core: avoid calling platform_device_put() twice in ucb1400_core_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 <[email protected]>
---
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 dbe2801..d73f84b 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:
--
1.5.4.3

2010-08-03 10:34:41

by Samuel Ortiz

Subject: Re: [PATCH] ucb1400_core: avoid calling platform_device_put() twice in ucb1400_core_probe error path

On Tue, Aug 03, 2010 at 04:34:13PM +0800, Axel Lin wrote:
> 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.
Patch applied, thanks.

Cheers,
Samuel.

--
Intel Open Source Technology Centre
http://oss.intel.com/

2010-08-03 11:23:54

by Marek Vasut

Subject: Re: [PATCH] ucb1400_core: avoid calling platform_device_put() twice in ucb1400_core_probe error path

----- Původní zpráva -----
> On Tue, Aug 03, 2010 at 04:34:13PM +0800, Axel Lin wrote:
> > 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.
> Patch applied, thanks.
>

Thanks guys, good catch!

Cheers
> Cheers,
> Samuel.
>
> --
> Intel Open Source Technology Centre
> http://oss.intel.com/