On Fri, 09 Jan 2015, Jacek Anaszewski wrote: > Modify FLASH_EN_SHIFT and TORCH_EN_SHIFT macros to work properly > when passed enum max77693_fled values (0 for FLED1 and 1 for FLED2) > from leds-max77693 driver. Off-by-one ay? Wasn't the original code tested? > Signed-off-by: Jacek Anaszewski <j.anaszewski@xxxxxxxxxxx> > Acked-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> > Cc: Chanwoo Choi <cw00.choi@xxxxxxxxxxx> > Cc: Lee Jones <lee.jones@xxxxxxxxxx> > --- > include/linux/mfd/max77693-private.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h > index 08dae01..01799a9 100644 > --- a/include/linux/mfd/max77693-private.h > +++ b/include/linux/mfd/max77693-private.h > @@ -113,8 +113,8 @@ enum max77693_pmic_reg { > #define FLASH_EN_FLASH 0x1 > #define FLASH_EN_TORCH 0x2 > #define FLASH_EN_ON 0x3 > -#define FLASH_EN_SHIFT(x) (6 - ((x) - 1) * 2) > -#define TORCH_EN_SHIFT(x) (2 - ((x) - 1) * 2) > +#define FLASH_EN_SHIFT(x) (6 - (x) * 2) > +#define TORCH_EN_SHIFT(x) (2 - (x) * 2) > > /* MAX77693 MAX_FLASH1 register */ > #define MAX_FLASH1_MAX_FL_EN 0x80 -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html