diff options
| author | Javier Martinez Canillas <javier.martinez@collabora.co.uk> | 2013-04-17 22:34:12 +0200 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-30 08:43:05 -0500 |
| commit | b327b3627bb428eb7d98f25224532425a673d89e (patch) | |
| tree | af1846072719995549c13619f16a4502759167ce | |
| parent | f2b09f67047aa5da60718f1a92e9b7f26b9266b4 (diff) | |
| download | olio-linux-3.10-b327b3627bb428eb7d98f25224532425a673d89e.tar.xz olio-linux-3.10-b327b3627bb428eb7d98f25224532425a673d89e.zip | |
ARM: OMAP2+: only WARN if a GPMC child probe function fail
If any of the GPMC child nodes fails, this shouldn't make the
whole gpmc_probe_dt() function to fail. It is better to just
WARN and allow other devices probe function to succeed.
Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 6166847a324..6c4da1254f5 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1533,10 +1533,9 @@ static int gpmc_probe_dt(struct platform_device *pdev) of_node_cmp(child->name, "nor") == 0) ret = gpmc_probe_generic_child(pdev, child); - if (ret < 0) { + if (WARN(ret < 0, "%s: probing gpmc child %s failed\n", + __func__, child->full_name)) of_node_put(child); - return ret; - } } return 0; |