Skip to content

Commit

Permalink
spi/tle620x: add missing device_remove_file()
Browse files Browse the repository at this point in the history
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 <axel.lin@gmail.com>
Acked-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Axel Lin authored and Grant Likely committed May 27, 2011
1 parent bc9bc72 commit 80b4037
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/spi/tle62x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand Down

0 comments on commit 80b4037

Please sign in to comment.