From: Boris Brezillon <boris.brezillon@free-electrons.com> To: "Thierry Reding" <thierry.reding@gmail.com>, linux-pwm@vger.kernel.org, "Mika Penttilä" <mika.penttila@nextfour.com> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Daniel Mack <daniel@zonque.org>, Haojian Zhuang <haojian.zhuang@gmail.com>, Robert Jarzmik <robert.jarzmik@free.fr>, Boris Brezillon <boris.brezillon@free-electrons.com> Subject: [PATCH] pwm: Fill pwm->args before calling pwm_request_from_chip() Date: Tue, 17 May 2016 12:35:32 +0200 [thread overview] Message-ID: <1463481333-23438-1-git-send-email-boris.brezillon@free-electrons.com> (raw) Commit e39c0df1be5a ("pwm: Introduce the pwm_args concept"), moved the period and polarity initialization steps into pwm_request_device() (called by pwm_request_from_chip()) based on the pwm->args information. Make sure we fill pwm->args fields before calling pwm_request_from_chip(). Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Reported-by: Mika Penttilä <mika.penttila@nextfour.com> Fixes: e39c0df1be5a ("pwm: Introduce the pwm_args concept") --- Mika, Can you test after applying this patch and let me know if it fixes your bug. Thanks, Boris drivers/pwm/core.c | 12 ++++++------ drivers/pwm/pwm-pxa.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 427142d..3d2eeaa 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -143,10 +143,6 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) if (args->args[0] >= pc->npwm) return ERR_PTR(-EINVAL); - pwm = pwm_request_from_chip(pc, args->args[0], NULL); - if (IS_ERR(pwm)) - return pwm; - pwm->args.period = args->args[1]; if (args->args[2] & PWM_POLARITY_INVERTED) @@ -154,6 +150,10 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) else pwm->args.polarity = PWM_POLARITY_NORMAL; + pwm = pwm_request_from_chip(pc, args->args[0], NULL); + if (IS_ERR(pwm)) + return pwm; + return pwm; } EXPORT_SYMBOL_GPL(of_pwm_xlate_with_flags); @@ -169,12 +169,12 @@ of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args) if (args->args[0] >= pc->npwm) return ERR_PTR(-EINVAL); + pwm->args.period = args->args[1]; + pwm = pwm_request_from_chip(pc, args->args[0], NULL); if (IS_ERR(pwm)) return pwm; - pwm->args.period = args->args[1]; - return pwm; } diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 58b709f..c33bd42 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -156,12 +156,12 @@ pxa_pwm_of_xlate(struct pwm_chip *pc, const struct of_phandle_args *args) { struct pwm_device *pwm; + pwm->args.period = args->args[0]; + pwm = pwm_request_from_chip(pc, 0, NULL); if (IS_ERR(pwm)) return pwm; - pwm->args.period = args->args[0]; - return pwm; } -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: boris.brezillon@free-electrons.com (Boris Brezillon) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] pwm: Fill pwm->args before calling pwm_request_from_chip() Date: Tue, 17 May 2016 12:35:32 +0200 [thread overview] Message-ID: <1463481333-23438-1-git-send-email-boris.brezillon@free-electrons.com> (raw) Commit e39c0df1be5a ("pwm: Introduce the pwm_args concept"), moved the period and polarity initialization steps into pwm_request_device() (called by pwm_request_from_chip()) based on the pwm->args information. Make sure we fill pwm->args fields before calling pwm_request_from_chip(). Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Reported-by: Mika Penttil? <mika.penttila@nextfour.com> Fixes: e39c0df1be5a ("pwm: Introduce the pwm_args concept") --- Mika, Can you test after applying this patch and let me know if it fixes your bug. Thanks, Boris drivers/pwm/core.c | 12 ++++++------ drivers/pwm/pwm-pxa.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index 427142d..3d2eeaa 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -143,10 +143,6 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) if (args->args[0] >= pc->npwm) return ERR_PTR(-EINVAL); - pwm = pwm_request_from_chip(pc, args->args[0], NULL); - if (IS_ERR(pwm)) - return pwm; - pwm->args.period = args->args[1]; if (args->args[2] & PWM_POLARITY_INVERTED) @@ -154,6 +150,10 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) else pwm->args.polarity = PWM_POLARITY_NORMAL; + pwm = pwm_request_from_chip(pc, args->args[0], NULL); + if (IS_ERR(pwm)) + return pwm; + return pwm; } EXPORT_SYMBOL_GPL(of_pwm_xlate_with_flags); @@ -169,12 +169,12 @@ of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args) if (args->args[0] >= pc->npwm) return ERR_PTR(-EINVAL); + pwm->args.period = args->args[1]; + pwm = pwm_request_from_chip(pc, args->args[0], NULL); if (IS_ERR(pwm)) return pwm; - pwm->args.period = args->args[1]; - return pwm; } diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c index 58b709f..c33bd42 100644 --- a/drivers/pwm/pwm-pxa.c +++ b/drivers/pwm/pwm-pxa.c @@ -156,12 +156,12 @@ pxa_pwm_of_xlate(struct pwm_chip *pc, const struct of_phandle_args *args) { struct pwm_device *pwm; + pwm->args.period = args->args[0]; + pwm = pwm_request_from_chip(pc, 0, NULL); if (IS_ERR(pwm)) return pwm; - pwm->args.period = args->args[0]; - return pwm; } -- 2.7.4
next reply other threads:[~2016-05-17 10:35 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-17 10:35 Boris Brezillon [this message] 2016-05-17 10:35 ` [PATCH] pwm: Fill pwm->args before calling pwm_request_from_chip() Boris Brezillon 2016-05-17 10:35 ` Boris Brezillon 2016-05-17 10:35 ` Boris Brezillon 2016-05-17 11:04 ` Thierry Reding 2016-05-17 11:04 ` Thierry Reding 2016-05-17 11:11 ` Boris Brezillon 2016-05-17 11:11 ` Boris Brezillon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1463481333-23438-1-git-send-email-boris.brezillon@free-electrons.com \ --to=boris.brezillon@free-electrons.com \ --cc=daniel@zonque.org \ --cc=haojian.zhuang@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=mika.penttila@nextfour.com \ --cc=robert.jarzmik@free.fr \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.