Use the return value from isl29018_set_integration_time() as the return
value for isl29018_chip_init() since this is the last piece of work
inside that function.

Signed-off-by: Brian Masney <masn...@onstation.org>
---
 drivers/staging/iio/light/isl29018.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/iio/light/isl29018.c 
b/drivers/staging/iio/light/isl29018.c
index 132de8e..6b6c761 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -616,12 +616,10 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
 
        status = isl29018_set_integration_time(chip,
                        isl29018_int_utimes[chip->type][chip->int_time]);
-       if (status < 0) {
+       if (status < 0)
                dev_err(dev, "Init of isl29018 fails\n");
-               return status;
-       }
 
-       return 0;
+       return status;
 }
 
 static const struct iio_info isl29018_info = {
-- 
2.5.5

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to