summaryrefslogtreecommitdiffstats
path: root/sys/dev/firewire
diff options
context:
space:
mode:
authorsimokawa <simokawa@FreeBSD.org>2007-05-21 12:17:54 +0000
committersimokawa <simokawa@FreeBSD.org>2007-05-21 12:17:54 +0000
commite75608db54b58b08650e3f909b71a7711f6d5ae4 (patch)
tree7310af27e1fcf21b9c78c1858cf46847c2bcfb25 /sys/dev/firewire
parent686c6f6d3e9a68ce84b9b305c68d5c8056d6b452 (diff)
downloadFreeBSD-src-e75608db54b58b08650e3f909b71a7711f6d5ae4.zip
FreeBSD-src-e75608db54b58b08650e3f909b71a7711f6d5ae4.tar.gz
Make sure fwsid is not NULL.
MFC after: 3 days
Diffstat (limited to 'sys/dev/firewire')
-rw-r--r--sys/dev/firewire/firewire.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index 79d0501..c8e8a53 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;
OpenPOWER on IntegriCloud