summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-05-11 20:39:05 +0800
committerGrant Likely <grant.likely@secretlab.ca>2011-05-26 21:30:25 -0600
commit80b4037033c2dae31e73810d506ce93b3783be05 (patch)
tree783fd060fd7fde5e26f655e183cf99405aab51a1 /drivers/spi
parentbc9bc72e2f9bb07384c00604d1a40d0b5f62be6c (diff)
downloadop-kernel-dev-80b4037033c2dae31e73810d506ce93b3783be05.zip
op-kernel-dev-80b4037033c2dae31e73810d506ce93b3783be05.tar.gz
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 <axel.lin@gmail.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/tle62x0.c3
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;
}
OpenPOWER on IntegriCloud