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 21dafe53ca492421fd6fe747e32ab3f7aa643dbd..a9c45c89b15eaca20f6a62957ff92dd20775a6de 100644 (file)
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -286,6 +286,7 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
 {
        int ret;
        u32 precharge, dclk, com_invdir, compins;
+       struct pwm_args pargs;
 
        if (par->device_info->need_pwm) {
                par->pwm = pwm_get(&par->client->dev, NULL);
@@ -294,7 +295,15 @@ static int ssd1307fb_init(struct ssd1307fb_par *par)
                        return PTR_ERR(par->pwm);
                }
 
-               par->pwm_period = pwm_get_period(par->pwm);
+               /*
+                * FIXME: pwm_apply_args() should be removed when switching to
+                * the atomic PWM API.
+                */
+               pwm_apply_args(par->pwm);
+
+               pwm_get_args(par->pwm, &pargs);
+
+               par->pwm_period = pargs.period;
                /* Enable the PWM */
                pwm_config(par->pwm, par->pwm_period / 2, par->pwm_period);
                pwm_enable(par->pwm);