diff options
author | David S. Miller <davem@davemloft.net> | 2019-08-24 13:46:57 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-08-24 13:46:57 -0700 |
commit | 12e2e15d837fd7d621d92fc81e3727304a2a2201 (patch) | |
tree | ec0a713bfe8f2d3f1007ab23a7366f7ea695f96a /net/ieee802154 | |
parent | 211c4624521527b19cb82ffd53fb34ae320059aa (diff) | |
parent | 074014abdf2bd2a00da3dd14a6ae04cafc1d62cc (diff) | |
download | linux-12e2e15d837fd7d621d92fc81e3727304a2a2201.tar.gz linux-12e2e15d837fd7d621d92fc81e3727304a2a2201.tar.bz2 linux-12e2e15d837fd7d621d92fc81e3727304a2a2201.zip |
Merge branch 'ieee802154-for-davem-2019-08-24' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan
Stefan Schmidt says:
====================
pull-request: ieee802154 for net 2019-08-24
An update from ieee802154 for your *net* tree.
Yue Haibing fixed two bugs discovered by KASAN in the hwsim driver for
ieee802154 and Colin Ian King cleaned up a redundant variable assignment.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ieee802154')
-rw-r--r-- | net/ieee802154/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c index dacbd58e1799..badc5cfe4dc6 100644 --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c @@ -1092,7 +1092,7 @@ static struct packet_type ieee802154_packet_type = { static int __init af_ieee802154_init(void) { - int rc = -EINVAL; + int rc; rc = proto_register(&ieee802154_raw_prot, 1); if (rc) |