diff options
Diffstat (limited to 'drivers/staging/iio/light')
-rw-r--r-- | drivers/staging/iio/light/tsl2583.c | 6 | ||||
-rw-r--r-- | drivers/staging/iio/light/tsl2x7x_core.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c index f8c6595..0a60def 100644 --- a/drivers/staging/iio/light/tsl2583.c +++ b/drivers/staging/iio/light/tsl2583.c @@ -433,7 +433,7 @@ static int taos_chip_on(struct iio_dev *indio_dev) TSL258X_CMD_REG | TSL258X_CNTRL, utmp); if (ret < 0) { dev_err(&chip->client->dev, "taos_chip_on failed on CNTRL reg.\n"); - return -1; + return ret; } /* Use the following shadow copy for our delay before enabling ADC. @@ -445,7 +445,7 @@ static int taos_chip_on(struct iio_dev *indio_dev) if (ret < 0) { dev_err(&chip->client->dev, "taos_chip_on failed on reg %d.\n", i); - return -1; + return ret; } } @@ -458,7 +458,7 @@ static int taos_chip_on(struct iio_dev *indio_dev) utmp); if (ret < 0) { dev_err(&chip->client->dev, "taos_chip_on failed on 2nd CTRL reg.\n"); - return -1; + return ret; } chip->taos_chip_status = TSL258X_CHIP_WORKING; diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c index 1e53808..9e0f2a9 100644 --- a/drivers/staging/iio/light/tsl2x7x_core.c +++ b/drivers/staging/iio/light/tsl2x7x_core.c @@ -352,7 +352,7 @@ static int tsl2x7x_get_lux(struct iio_dev *indio_dev) /* device is not enabled */ dev_err(&chip->client->dev, "%s: device is not enabled\n", __func__); - ret = -EBUSY ; + ret = -EBUSY; goto out_unlock; } @@ -1507,16 +1507,16 @@ static int tsl2x7x_device_id(unsigned char *id, int target) case tsl2571: case tsl2671: case tsl2771: - return ((*id & 0xf0) == TRITON_ID); + return (*id & 0xf0) == TRITON_ID; case tmd2671: case tmd2771: - return ((*id & 0xf0) == HALIBUT_ID); + return (*id & 0xf0) == HALIBUT_ID; case tsl2572: case tsl2672: case tmd2672: case tsl2772: case tmd2772: - return ((*id & 0xf0) == SWORDFISH_ID); + return (*id & 0xf0) == SWORDFISH_ID; } return -EINVAL; |