Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (ddb1d4ed) · Commits · e / devices / android_kernel_samsung_exynos5433

drivers/i2c/chips/tsl2550.c

+10 −7

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,7 @@
	#include <linux/delay.h>		#include <linux/delay.h>

	#define TSL2550_DRV_NAME "tsl2550"		#define TSL2550_DRV_NAME "tsl2550"
	#define DRIVER_VERSION "1.1.1"		#define DRIVER_VERSION "1.1.2"

	/*		/*
	* Defines		* Defines
	@@ -189,13 +189,16 @@ static int tsl2550_calculate_lux(u8 ch0, u8 ch1)
	u8 r = 128;		u8 r = 128;

	/* Avoid division by 0 and count 1 cannot be greater than count 0 */		/* Avoid division by 0 and count 1 cannot be greater than count 0 */
	if (c0 && (c1 <= c0))		if (c1 <= c0)
			if (c0) {
	r = c1 * 128 / c0;		r = c1 * 128 / c0;
	else
	return -1;

	/* Calculate LUX */		/* Calculate LUX */
	lux = ((c0 - c1) * ratio_lut[r]) / 256;		lux = ((c0 - c1) * ratio_lut[r]) / 256;
			} else
			lux = 0;
			else
			return -EAGAIN;

	/* LUX range check */		/* LUX range check */
	return lux > TSL2550_MAX_LUX ? TSL2550_MAX_LUX : lux;		return lux > TSL2550_MAX_LUX ? TSL2550_MAX_LUX : lux;