Merge tag 'pwm/for-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[karo-tx-linux.git] / drivers / video / fbdev / ssd1307fb.c

diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 652f68880d608c109e49a0c8b6ef23bfe90de013..a9c45c89b15eaca20f6a62957ff92dd20775a6de 100644 (file)
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -398,7 +398,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
                return ret;
 
        ret = ssd1307fb_write_cmd(par->client,
-               (par->device_info->need_chargepump & 0x1 << 2) & 0x14);
+               BIT(4) | (par->device_info->need_chargepump ? BIT(2) : 0));
        if (ret < 0)
                return ret;