linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Johan Hovold <jhovold@gmail.com>
Subject: [PATCH 3.10 19/24] misc: atmel_pwm: add deferred-probing support
Date: Mon, 18 Nov 2013 10:42:29 -0800	[thread overview]
Message-ID: <20131118184223.412732541@linuxfoundation.org> (raw)
In-Reply-To: <20131118184222.017393843@linuxfoundation.org>

3.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Johan Hovold <jhovold@gmail.com>

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>

---
 drivers/misc/atmel_pwm.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/drivers/misc/atmel_pwm.c
+++ b/drivers/misc/atmel_pwm.c
@@ -90,8 +90,10 @@ int pwm_channel_alloc(int index, struct
 	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)



  parent reply	other threads:[~2013-11-18 18:47 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-18 18:42 [PATCH 3.10 00/24] 3.10.20-stable review Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 01/24] ip_gre: Fix WCCPv2 header parsing Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 02/24] ipv6: ip6_dst_check needs to check for expired dst_entries Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 03/24] ipv6: reset dst.expires value when clearing expire flag Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 04/24] cxgb3: Fix length calculation in write_ofld_wr() on 32-bit architectures Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 05/24] xen-netback: use jiffies_64 value to calculate credit timeout Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 06/24] virtio-net: correctly handle cpu hotplug notifier during resuming Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 07/24] net: flow_dissector: fail on evil iph->ihl Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 08/24] net/mlx4_core: Fix call to __mlx4_unregister_mac Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 09/24] xen-netback: Handle backend state transitions in a more robust way Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 10/24] xen-netback: transition to CLOSED when removing a VIF Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 11/24] batman-adv: set up network coding packet handlers during module init Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 12/24] hyperv-fb: add pci stub Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 13/24] USB: add new zte 3g-dongles pid to option.c Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 14/24] ALSA: hda - hdmi: Fix reported channel map on common default layouts Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 15/24] tracing: Fix potential out-of-bounds in trace_get_user() Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 16/24] perf: Fix perf ring buffer memory ordering Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 17/24] iwlwifi: add new 7260 and 3160 series device IDs Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 18/24] iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC series Greg Kroah-Hartman
2013-11-18 18:42 ` Greg Kroah-Hartman [this message]
2013-11-18 18:42 ` [PATCH 3.10 20/24] backlight: atmel-pwm-bl: fix deferred probe from __init Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 21/24] usb: fix cleanup after failure in hub_configure() Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 22/24] usb: fail on usb_hub_create_port_device() errors Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 23/24] usbcore: set lpm_capable field for LPM capable root hubs Greg Kroah-Hartman
2013-11-18 18:42 ` [PATCH 3.10 24/24] media: sh_vou: almost forever loop in sh_vou_try_fmt_vid_out() Greg Kroah-Hartman
2013-11-19  3:08 ` [PATCH 3.10 00/24] 3.10.20-stable review Guenter Roeck
2013-11-20 11:05 ` Satoru Takeuchi
2013-11-20 15:27 ` Shuah Khan

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=20131118184223.412732541@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=jhovold@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).