Merge remote-tracking branch 'grant/devicetree/next' into for-3.14

2014-01-23 08:23:04 -06:00
parent 9b9900aa60 2a9330010b
commit 619d144013
3 changed files with 80 additions and 0 deletions
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -415,6 +415,9 @@ static int __of_device_is_available(const struct device_node *device)
 	const char *status;
 	int statlen;

+	if (!device)
+		return 0;
+
 	status = __of_get_property(device, "status", &statlen);
 	if (status == NULL)
 		return 1;