diff options
| author | Thierry Reding <thierry.reding@gmail.com> | 2017-07-06 17:16:45 +0200 |
|---|---|---|
| committer | Thierry Reding <thierry.reding@gmail.com> | 2017-07-06 17:16:45 +0200 |
| commit | d007a00b566b9062a2a91d5ea391bd13fb44c606 (patch) | |
| tree | 2c97eaef062b525f6c77b7d4469d15ffacedd074 /drivers/pwm/core.c | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
| parent | 93c292ef3cbb46db78853763fc4d9a5b9dfb97d5 (diff) | |
Merge branch 'for-4.13/core' into for-next
Diffstat (limited to 'drivers/pwm/core.c')
| -rw-r--r-- | drivers/pwm/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index a0860b30bd93..1581f6ab1b1f 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -678,7 +678,9 @@ struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id) pc = of_node_to_pwmchip(args.np); if (IS_ERR(pc)) { - pr_err("%s(): PWM chip not found\n", __func__); + if (PTR_ERR(pc) != -EPROBE_DEFER) + pr_err("%s(): PWM chip not found\n", __func__); + pwm = ERR_CAST(pc); goto put; } |