[PATCH] Input: ims-pcu - fix error unwinding path in application mode

[PATCH] Input: ims-pcu - fix error unwinding path in application mode

[Dmitry Torokhov]

We first create backlight and then input devices so we shoudl destroy them
in opposite order when handling errors.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

Andrey, this fixup was split off from the patch I sent earlier today.

 drivers/input/misc/ims-pcu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
index 4244f47..513ecdf 100644
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
@@ -1929,10 +1929,10 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
 
 	return 0;
 
-err_destroy_backlight:
-	ims_pcu_destroy_backlight(pcu);
 err_destroy_buttons:
 	ims_pcu_destroy_buttons(pcu);
+err_destroy_backlight:
+	ims_pcu_destroy_backlight(pcu);
 	return error;
 }
 
-- 
1.8.4.2


-- 
Dmitry

Re: [PATCH] Input: ims-pcu - fix error unwinding path in application mode

[Andrey Smirnov]

Dmitry,

Do you want this patch to go separatly or do you want me to bundle it
with my other changes(probably the first one)?
Also, offtopic, do you want me to backport this changes to 2.6 kernel
that IMS uses or would you do it?

Thanks,

On Fri, Jan 3, 2014 at 9:00 PM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> We first create backlight and then input devices so we shoudl destroy them
> in opposite order when handling errors.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
>
> Andrey, this fixup was split off from the patch I sent earlier today.
>
>  drivers/input/misc/ims-pcu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
> index 4244f47..513ecdf 100644
> --- a/drivers/input/misc/ims-pcu.c
> +++ b/drivers/input/misc/ims-pcu.c
> @@ -1929,10 +1929,10 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
>
>         return 0;
>
> -err_destroy_backlight:
> -       ims_pcu_destroy_backlight(pcu);
>  err_destroy_buttons:
>         ims_pcu_destroy_buttons(pcu);
> +err_destroy_backlight:
> +       ims_pcu_destroy_backlight(pcu);
>         return error;
>  }
>
> --
> 1.8.4.2
>
>
> --
> Dmitry

Re: [PATCH] Input: ims-pcu - fix error unwinding path in application mode

[Dmitry Torokhov]

On Fri, Jan 03, 2014 at 09:13:10PM -0800, Andrey Smirnov wrote:
> Dmitry,
> 
> Do you want this patch to go separatly or do you want me to bundle it
> with my other changes(probably the first one)?

I'll apply it separately.

> Also, offtopic, do you want me to backport this changes to 2.6 kernel
> that IMS uses or would you do it?

It should apply as is, no backport needed as far as I can tell.

-- 
Dmitry