Module Name: src
Committed By: martin
Date: Sun Mar 26 12:51:42 UTC 2017
Modified Files:
src/sys/arch/sparc64/dev: psycho.c
Log Message:
Do not call OF_getprop on our node blindly - for the "pcons" hack we may
be called with all zeroed attach args.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/sparc64/dev/psycho.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/psycho.c
diff -u src/sys/arch/sparc64/dev/psycho.c:1.125 src/sys/arch/sparc64/dev/psycho.c:1.126
--- src/sys/arch/sparc64/dev/psycho.c:1.125 Fri Mar 24 01:14:26 2017
+++ src/sys/arch/sparc64/dev/psycho.c Sun Mar 26 12:51:42 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: psycho.c,v 1.125 2017/03/24 01:14:26 macallan Exp $ */
+/* $NetBSD: psycho.c,v 1.126 2017/03/26 12:51:42 martin Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.125 2017/03/24 01:14:26 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psycho.c,v 1.126 2017/03/26 12:51:42 martin Exp $");
#include "opt_ddb.h"
@@ -228,9 +228,13 @@ static int
psycho_match(device_t parent, cfdata_t match, void *aux)
{
struct mainbus_attach_args *ma = aux;
- char *model = prom_getpropstring(ma->ma_node, "model");
+ char *model;
int i;
+ if (ma->ma_node == 0)
+ return 0; /* no OF node, can't be us */
+
+ model = prom_getpropstring(ma->ma_node, "model");
/* match on a name of "pci" and a sabre or a psycho */
if (strcmp(ma->ma_name, ROM_PCI_NAME) == 0) {
for (i=0; psycho_names[i].p_name; i++)
