From 9a81a627421652be3018637b32e088f50d2d36e1 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Tue, 22 Apr 2008 10:46:44 +1000 Subject: [PATCH] --- yaml --- r: 93107 b: refs/heads/master c: be63c09afe9153be6ba4373d1b69848cf2b32268 h: refs/heads/master i: 93105: 3edf6dbdc547032e70aed3f8d5fa136cad8e0a6c 93103: 910bb7146fa0ee403487d5063cbcc6e2a3df8f02 v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/core.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 69bd45310a6e..68726f5e60ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51d4a1cc2e20e2848c6141989f733f0e6548598b +refs/heads/master: be63c09afe9153be6ba4373d1b69848cf2b32268 diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c index c30348e402d5..7c66727359d4 100644 --- a/trunk/drivers/net/ibm_newemac/core.c +++ b/trunk/drivers/net/ibm_newemac/core.c @@ -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 */