diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-10-22 18:32:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-20 12:37:36 -0800 |
| commit | 0fe6a2bc2f2ee462d158c737bae7c50ab72b6b57 (patch) | |
| tree | d236dcc03eccf6ace0594da0a663210b832e1c99 | |
| parent | a80d0c3c09801b9550b025c77b4c0f0487f8fa75 (diff) | |
| download | linux-stable-0fe6a2bc2f2ee462d158c737bae7c50ab72b6b57.tar.gz linux-stable-0fe6a2bc2f2ee462d158c737bae7c50ab72b6b57.tar.bz2 linux-stable-0fe6a2bc2f2ee462d158c737bae7c50ab72b6b57.zip | |
misc: atmel_pwm: add deferred-probing support
commit 5c6d6fd1564138ad048564e48639f842714a90c6 upstream.
Two drivers (atmel-pwm-bl and leds-atmel-pwm) currently depend on the
atmel_pwm driver to have bound to any pwm-device before their devices
are probed.
Support deferred probing of such devices by making sure to return
-EPROBE_DEFER from pwm_channel_alloc when no pwm-device has yet been
bound.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/misc/atmel_pwm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c index 494d0500bda6..a6dc56e1bc58 100644 --- a/drivers/misc/atmel_pwm.c +++ b/drivers/misc/atmel_pwm.c @@ -90,8 +90,10 @@ int pwm_channel_alloc(int index, struct pwm_channel *ch) unsigned long flags; int status = 0; - /* insist on PWM init, with this signal pinned out */ - if (!pwm || !(pwm->mask & 1 << index)) + if (!pwm) + return -EPROBE_DEFER; + + if (!(pwm->mask & 1 << index)) return -ENODEV; if (index < 0 || index >= PWM_NCHAN || !ch) |