diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-22 19:18:54 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-24 02:15:26 -0400 |
commit | de8d28b16f5614aeb12bb69c8f9a38578b8d3ada (patch) | |
tree | 152f0930dc099606342e9cc6d9a3892cd9f3f192 /drivers/sbus | |
parent | 765b5f32730cfd2608291e679060b0391570c8b3 (diff) |
[SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.
One thing this change pointed out was that we really should
pull the "get 'local-mac-address' property" logic into a helper
function all the network drivers can call.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/sbus')
-rw-r--r-- | drivers/sbus/char/openprom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index 239e108b8ed1..cf5b476b5496 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c | |||
@@ -243,8 +243,8 @@ static int openprom_sunos_ioctl(struct inode * inode, struct file * file, | |||
243 | ((int *) opp->oprom_array)[1]); | 243 | ((int *) opp->oprom_array)[1]); |
244 | 244 | ||
245 | pcp = pdev->sysdata; | 245 | pcp = pdev->sysdata; |
246 | if (pcp != NULL && pcp->prom_node != -1 && pcp->prom_node) { | 246 | if (pcp != NULL) { |
247 | node = pcp->prom_node; | 247 | node = pcp->prom_node->node; |
248 | data->current_node = node; | 248 | data->current_node = node; |
249 | *((int *)opp->oprom_array) = node; | 249 | *((int *)opp->oprom_array) = node; |
250 | opp->oprom_size = sizeof(int); | 250 | opp->oprom_size = sizeof(int); |