From ea96a1683ca1ecb91676395c6796e53dd74bb10c Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Mon, 26 Apr 2010 11:20:32 -0700
Subject: [PATCH] --- yaml --- r: 190351 b: refs/heads/master c:
 93c0c8b4a5a174645550d444bd5c3ff0cccf74cb h: refs/heads/master i:   190349:
 4508c1fa6cda245633c44e4d9daeed647e882a22   190347:
 0f7b93c165b04e02099824f9f74496bd97e9e941   190343:
 3608579efe68e34cc997d9d596217e661402334c   190335:
 51407d4401bc2c4697964bcbdada3d00a57a49db v: v3

---
 [refs]                               | 2 +-
 trunk/net/ieee802154/af_ieee802154.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e7b6473e8c60..c4a46ecaff17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc8bf1b1a6edfc92465526de19772061302f0929
+refs/heads/master: 93c0c8b4a5a174645550d444bd5c3ff0cccf74cb
diff --git a/trunk/net/ieee802154/af_ieee802154.c b/trunk/net/ieee802154/af_ieee802154.c
index c7da600750bb..93c91b633a56 100644
--- a/trunk/net/ieee802154/af_ieee802154.c
+++ b/trunk/net/ieee802154/af_ieee802154.c
@@ -151,6 +151,9 @@ static int ieee802154_dev_ioctl(struct sock *sk, struct ifreq __user *arg,
 	dev_load(sock_net(sk), ifr.ifr_name);
 	dev = dev_get_by_name(sock_net(sk), ifr.ifr_name);
 
+	if (!dev)
+		return -ENODEV;
+
 	if (dev->type == ARPHRD_IEEE802154 && dev->netdev_ops->ndo_do_ioctl)
 		ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, cmd);