On Mon, Jul 13, 2009 at 11:40:47AM +0200, Michele De Candia (VT) wrote:
> Signed-off-by: Michele Jr De Candia <michele.decandia@xxxxxxxxxxxxx>
>
> diff --git a/drivers/i2c/chips/tsl2550.c b/drivers/i2c/chips/tsl2550.c
> index 1a9cc13..561d7bf 100644
> --- a/drivers/i2c/chips/tsl2550.c
> +++ b/drivers/i2c/chips/tsl2550.c
> @@ -27,7 +27,7 @@
> #include <linux/delay.h>
>
> #define TSL2550_DRV_NAME "tsl2550"
> -#define DRIVER_VERSION "1.1.1"
> +#define DRIVER_VERSION "1.1.2"
>
> /*
> * Defines
> @@ -189,13 +189,16 @@ static int tsl2550_calculate_lux(u8 ch0, u8 ch1)
> u8 r = 128;
>
> /* Avoid division by 0 and count 1 cannot be greater than count 0 */
> - if (c0 && (c1 <= c0))
> - r = c1 * 128 / c0;
> + if (c1 <= c0)
> + if (c0) {
> + r = c1 * 128 / c0;
> +
> + /* Calculate LUX */
> + lux = ((c0 - c1) * ratio_lut[r]) / 256;
> + } else
> + lux = 0;
> else
> - return -1;
> -
> - /* Calculate LUX */
> - lux = ((c0 - c1) * ratio_lut[r]) / 256;
> + return -EAGAIN;
>
> /* LUX range check */
> return lux > TSL2550_MAX_LUX ? TSL2550_MAX_LUX : lux;
Acked-by: Rodolfo Giometti <giometti@xxxxxxxx>
--
GNU/Linux Solutions e-mail: giometti@xxxxxxxxxxxx
Linux Device Driver giometti@xxxxxxxx
Embedded Systems phone: +39 349 2432127
UNIX programming skype: rodolfo.giometti
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
