From c5e95b0bc577174070491fbc2ac333b8f75c88ef Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh.de>
Date: Mon, 20 Feb 2006 08:30:30 +0000
Subject: [PATCH] Bug: NULL pointer dereference in master/device.c behoben.

---
 devices/8139too.c | 2 +-
 master/device.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/devices/8139too.c b/devices/8139too.c
index 92d52371..3cf1171f 100644
--- a/devices/8139too.c
+++ b/devices/8139too.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- *  drv_8139too.c
+ *  8 1 3 9 t o o . c
  *
  *  EtherCAT-Treiber für RTL8139-kompatible Netzwerkkarten.
  *
diff --git a/master/device.c b/master/device.c
index 07b2a1ee..8716bbe4 100644
--- a/master/device.c
+++ b/master/device.c
@@ -347,7 +347,7 @@ void EtherCAT_dev_state(ec_device_t *ecd, ec_device_state_t state)
 
 int EtherCAT_dev_is_ec(ec_device_t *ecd, struct net_device *dev)
 {
-  return ecd->dev == dev;
+  return ecd && ecd->dev == dev;
 }
 
 /*****************************************************************************/