2011-05-11 16:42:34

by Axel Lin

Subject: [PATCH] spi: tle620x: add missing device_remove_file()

This patch includes below fixes:
1. Add missing device_remove_file for dev_attr_status_show in tle62x0_remove.
2. Fix tle62x0_probe error handling:
Currently, if the error happens when ptr > 0, gpio_attrs[0] is not
properly remove.

Signed-off-by: Axel Lin <[email protected]>
---
drivers/spi/tle62x0.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/spi/tle62x0.c b/drivers/spi/tle62x0.c
index a393895..32a4087 100644
--- a/drivers/spi/tle62x0.c
+++ b/drivers/spi/tle62x0.c
@@ -283,7 +283,7 @@ static int __devinit tle62x0_probe(struct spi_device *spi)
return 0;

err_gpios:
- for (; ptr > 0; ptr--)
+ while (--ptr >= 0)
device_remove_file(&spi->dev, gpio_attrs[ptr]);

device_remove_file(&spi->dev, &dev_attr_status_show);
@@ -301,6 +301,7 @@ static int __devexit tle62x0_remove(struct spi_device *spi)
for (ptr = 0; ptr < st->nr_gpio; ptr++)
device_remove_file(&spi->dev, gpio_attrs[ptr]);

+ device_remove_file(&spi->dev, &dev_attr_status_show);
kfree(st);
return 0;
}
--
1.7.1

2011-05-12 08:46:49

by Ben Dooks

Subject: Re: [PATCH] spi: tle620x: add missing device_remove_file()

On 11/05/11 13:39, Axel Lin wrote:
> This patch includes below fixes:
> 1. Add missing device_remove_file for dev_attr_status_show in tle62x0_remove.
> 2. Fix tle62x0_probe error handling:
> Currently, if the error happens when ptr> 0, gpio_attrs[0] is not
> properly remove.
>
> Signed-off-by: Axel Lin<[email protected]>
Acked-by: Ben Dooks <[email protected]>
> ---
> drivers/spi/tle62x0.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/spi/tle62x0.c b/drivers/spi/tle62x0.c
> index a393895..32a4087 100644
> --- a/drivers/spi/tle62x0.c
> +++ b/drivers/spi/tle62x0.c
> @@ -283,7 +283,7 @@ static int __devinit tle62x0_probe(struct spi_device *spi)
> return 0;
>
> err_gpios:
> - for (; ptr> 0; ptr--)
> + while (--ptr>= 0)
> device_remove_file(&spi->dev, gpio_attrs[ptr]);
>
> device_remove_file(&spi->dev,&dev_attr_status_show);
> @@ -301,6 +301,7 @@ static int __devexit tle62x0_remove(struct spi_device *spi)
> for (ptr = 0; ptr< st->nr_gpio; ptr++)
> device_remove_file(&spi->dev, gpio_attrs[ptr]);
>
> + device_remove_file(&spi->dev,&dev_attr_status_show);
> kfree(st);
> return 0;
> }

2011-05-27 03:31:04

by Grant Likely

Subject: Re: [PATCH] spi: tle620x: add missing device_remove_file()

On Thu, May 12, 2011 at 09:25:41AM +0100, Ben Dooks wrote:
> On 11/05/11 13:39, Axel Lin wrote:
> >This patch includes below fixes:
> >1. Add missing device_remove_file for dev_attr_status_show in tle62x0_remove.
> >2. Fix tle62x0_probe error handling:
> > Currently, if the error happens when ptr> 0, gpio_attrs[0] is not
> > properly remove.
> >
> >Signed-off-by: Axel Lin<[email protected]>
> Acked-by: Ben Dooks <[email protected]>

Applied, thanks.

g.