|
@@ -2562,8 +2562,11 @@ static int __devinit emac_probe(struct of_device *ofdev,
|
|
|
struct device_node **blist = NULL;
|
|
|
int err, i;
|
|
|
|
|
|
- /* Skip unused/unwired EMACS */
|
|
|
- if (of_get_property(np, "unused", NULL))
|
|
|
+ /* Skip unused/unwired EMACS. We leave the check for an unused
|
|
|
+ * property here for now, but new flat device trees should set a
|
|
|
+ * status property to "disabled" instead.
|
|
|
+ */
|
|
|
+ if (of_get_property(np, "unused", NULL) || !of_device_is_available(np))
|
|
|
return -ENODEV;
|
|
|
|
|
|
/* Find ourselves in the bootlist if we are there */
|