Merge branch 'fix/dw' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-dw

Conflicts:
	drivers/spi/spi-dw-mid.c

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index 4b66bf09ee55..d2c35920ff08 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -606,6 +606,8 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
         unsigned int best = 0;
         struct pwm_lookup *p;
         unsigned int match;
+        unsigned int period;
+        enum pwm_polarity polarity;
 
         /* look up via DT first */
         if (IS_ENABLED(CONFIG_OF) && dev && dev->of_node)
@@ -653,6 +655,8 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
                 if (match > best) {
                         chip = pwmchip_find_by_name(p->provider);
                         index = p->index;
+                        period = p->period;
+                        polarity = p->polarity;
 
                         if (match != 3)
                                 best = match;
@@ -668,8 +672,8 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
         if (IS_ERR(pwm))
                 return pwm;
 
-        pwm_set_period(pwm, p->period);
-        pwm_set_polarity(pwm, p->polarity);
+        pwm_set_period(pwm, period);
+        pwm_set_polarity(pwm, polarity);
 
 
         return pwm;