Merge branch 'ieee802154-for-davem-2019-03-19' of... (e8629d29) · Commits · 戴 / test

Merge branch 'ieee802154-for-davem-2019-03-19' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan Stefan Schmidt says: ==================== pull-request: ieee802154 for net 2019-03-19 An update from ieee802154 for your *net* tree. Kangjie Lu fixed a potential NULL pointer deref in the adf7242 driver and Li RongQing make sure we propagate a netlink return code to the caller. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ieee802154/adf7242.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1268,6 +1268,10 @@ static int adf7242_probe(struct spi_device *spi)
		INIT_DELAYED_WORK(&lp->work, adf7242_rx_cal_work);
		lp->wqueue = alloc_ordered_workqueue(dev_name(&spi->dev),
		WQ_MEM_RECLAIM);
		if (unlikely(!lp->wqueue)) {
		ret = -ENOMEM;
		goto err_hw_init;
		}

		ret = adf7242_hw_init(lp);
		if (ret)

drivers/net/ieee802154/mac802154_hwsim.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -324,7 +324,7 @@ static int hwsim_get_radio_nl(struct sk_buff msg, struct genl_info info)
		goto out_err;
		}

		genlmsg_reply(skb, info);
		res = genlmsg_reply(skb, info);
		break;
		}

Admin message