Skip to content

Commit

Permalink
ARM: OMAP2+: only WARN if a GPMC child probe function fail
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Javier Martinez Canillas authored and Jon Hunter committed Apr 30, 2013
1 parent f2b09f6 commit b327b36
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/arm/mach-omap2/gpmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b327b36

Please sign in to comment.