summaryrefslogtreecommitdiffstats
path: root/drivers/pwm/core.c
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-05-19 22:42:32 +0200
committerThierry Reding <thierry.reding@gmail.com>2014-05-21 09:03:07 +0200
commit3796ce1d4d4b330a75005c5eda105603ce9d4071 (patch)
treefdaed3c8281bee1e5bba3400d2f5ca7aecb47ce1 /drivers/pwm/core.c
parent9c88669c2cfc91158f157b5584103ff7e5b6bedb (diff)
downloadlinux-3796ce1d4d4b330a75005c5eda105603ce9d4071.tar.bz2
pwm: add period and polarity to struct pwm_lookup
Add period and polarity members to struct pwm_lookup so that platforms using the lookup table can be treated the same way as those using the device tree. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
Diffstat (limited to 'drivers/pwm/core.c')
-rw-r--r--drivers/pwm/core.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c
index a80471399c20..4b66bf09ee55 100644
--- a/drivers/pwm/core.c
+++ b/drivers/pwm/core.c
@@ -661,10 +661,16 @@ struct pwm_device *pwm_get(struct device *dev, const char *con_id)
}
}
+ mutex_unlock(&pwm_lookup_lock);
+
if (chip)
pwm = pwm_request_from_chip(chip, index, con_id ?: dev_id);
+ if (IS_ERR(pwm))
+ return pwm;
+
+ pwm_set_period(pwm, p->period);
+ pwm_set_polarity(pwm, p->polarity);
- mutex_unlock(&pwm_lookup_lock);
return pwm;
}