Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[firefly-linux-kernel-4.4.55.git] / net / ieee802154 / netlink.c

diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index 105ad10876afe3dc06d2a5d2002900b297601879..27eda9fdf3c207f371864fa7ee81c2480f6999e9 100644 (file)
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -276,6 +276,9 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info)
        else
                return NULL;
 
+       if (!dev)
+               return NULL;
+
        if (dev->type != ARPHRD_IEEE802154) {
                dev_put(dev);
                return NULL;
@@ -521,3 +524,6 @@ static void __exit ieee802154_nl_exit(void)
 }
 module_exit(ieee802154_nl_exit);
 
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("ieee 802.15.4 configuration interface");
+