ソースを参照

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>
Javier Martinez Canillas 12 年 前
コミット
b327b3627b
1 ファイル変更2 行追加3 行削除
  1. 2 3
      arch/arm/mach-omap2/gpmc.c

+ 2 - 3
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)
 			 of_node_cmp(child->name, "nor") == 0)
 			ret = gpmc_probe_generic_child(pdev, child);
 			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);
 			of_node_put(child);
-			return ret;
-		}
 	}
 	}
 
 
 	return 0;
 	return 0;