lkml.org 
[lkml]   [2012]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] gpio/stmpe: Correct cleanup for no-irq mode
On 1/25/2012 4:36 AM, Linus WALLEIJ wrote:
> From: Chris Blair <chris.blair@stericsson.com>
>
> Corrects error condition and driver removal cleanup for the no-irq
> configuration.
>
> Cc: Viresh Kumar <viresh.kumar@st.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Signed-off-by: Chris Blair <chris.blair@stericsson.com>
> ---
> This depends on the previous patch to the MFD code so should
> better be merged into the MFD tree with the previous patch.
> ---
> drivers/gpio/gpio-stmpe.c | 12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
> index 87a68a8..1008c7c 100644
> --- a/drivers/gpio/gpio-stmpe.c
> +++ b/drivers/gpio/gpio-stmpe.c
> @@ -361,9 +361,11 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
> return 0;
>
> out_freeirq:
> - free_irq(irq, stmpe_gpio);
> + if (!stmpe->pdata->no_irq)
> + free_irq(irq, stmpe_gpio);
> out_removeirq:
> - stmpe_gpio_irq_remove(stmpe_gpio);
> + if (!stmpe->pdata->no_irq)
> + stmpe_gpio_irq_remove(stmpe_gpio);
> out_disable:
> stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
> out_free:
> @@ -391,8 +393,10 @@ static int __devexit stmpe_gpio_remove(struct platform_device *pdev)
>
> stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
>
> - free_irq(irq, stmpe_gpio);
> - stmpe_gpio_irq_remove(stmpe_gpio);
> + if (!stmpe->pdata->no_irq) {
> + free_irq(irq, stmpe_gpio);
> + stmpe_gpio_irq_remove(stmpe_gpio);
> + }
> platform_set_drvdata(pdev, NULL);
> kfree(stmpe_gpio);
>

Please check others stmpe drivers too, stmpe-ts & stmpe-keypad. :)

Acked-by: Viresh Kumar <viresh.kumar@st.com>

--
viresh


\
 
 \ /
  Last update: 2012-01-25 04:43    [from the cache]
©2003-2011 Jasper Spaans