diff options
| author | Thierry Reding <[email protected]> | 2017-02-10 15:15:54 +0100 |
|---|---|---|
| committer | Thierry Reding <[email protected]> | 2017-02-10 15:15:54 +0100 |
| commit | 652f319667383f2b2c62dda7841265bedd89c5a3 (patch) | |
| tree | 33bc36f29bee3acf277fded5b5d30513d16bfd53 /drivers/pwm/pwm-mxs.c | |
| parent | 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff) | |
| parent | b526a314263ea217b8fa9758dca5dc245fd49997 (diff) | |
Merge branch 'for-4.11/core' into for-next
Diffstat (limited to 'drivers/pwm/pwm-mxs.c')
| -rw-r--r-- | drivers/pwm/pwm-mxs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c index 9a596324ebef..a6017ad9926c 100644 --- a/drivers/pwm/pwm-mxs.c +++ b/drivers/pwm/pwm-mxs.c @@ -151,7 +151,7 @@ static int mxs_pwm_probe(struct platform_device *pdev) mxs->chip.dev = &pdev->dev; mxs->chip.ops = &mxs_pwm_ops; mxs->chip.base = -1; - mxs->chip.can_sleep = true; + ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm); if (ret < 0) { dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret); |