Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/spi/tle62x0.c b/drivers/spi/tle62x0.c
index a3938958147c..32a40876532f 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;
 }