From bebdf94c45373b1fe4b1317062b5495d1b829cb4 Mon Sep 17 00:00:00 2001 From: Hidetoshi Shimokawa Date: Mon, 21 May 2007 12:17:54 +0000 Subject: [PATCH] Make sure fwsid is not NULL. MFC after: 3 days --- sys/dev/firewire/firewire.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c index 79d0501a3625..c8e8a53d5f03 100644 --- a/sys/dev/firewire/firewire.c +++ b/sys/dev/firewire/firewire.c @@ -1485,6 +1485,7 @@ fw_explore(struct firewire_comm *fc) int node, err, s, i, todo, todo2, trys; char nodes[63]; struct fw_device dfwdev; + union fw_self_id *fwsid; todo = 0; /* setup dummy fwdev */ @@ -1497,7 +1498,8 @@ fw_explore(struct firewire_comm *fc) /* We don't probe myself and linkdown nodes */ if (node == fc->nodeid) continue; - if (!fw_find_self_id(fc, node)->p0.link_active) { + fwsid = fw_find_self_id(fc, node); + if (!fwsid || !fwsid->p0.link_active) { if (firewire_debug) printf("node%d: link down\n", node); continue;