Commit 92439a85 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge tag 'ieee802154-for-net-2022-12-05' of... 

Merge tag 'ieee802154-for-net-2022-12-05' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan

Stefan Schmidt says:

====================
pull-request: ieee802154 for net 2022-12-05

An update from ieee802154 for your *net* tree:

Three small fixes this time around.

Ziyang Xuan fixed an error code for a timeout during initialization of the
cc2520 driver.
Hauke Mehrtens fixed a crash in the ca8210 driver SPI communication due
uninitialized SPI structures.
Wei Yongjun added INIT_LIST_HEAD ieee802154_if_add() to avoid a potential
null pointer dereference.
====================

Link: https://lore.kernel.org/r/20221205122515.1720539-1-stefan@datenfreihafen.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 4fad22a1 b3d72d31

drivers/net/ieee802154/ca8210.c

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ static int ca8210_spi_transfer( 


	dev_dbg(&spi->dev, "%s called\n", __func__);



	cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC);

	cas_ctl = kzalloc(sizeof(*cas_ctl), GFP_ATOMIC);

	if (!cas_ctl)

		return -ENOMEM;

drivers/net/ieee802154/cc2520.c

+1 −1
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ static int cc2520_hw_init(struct cc2520_private *priv) 


		if (timeout-- <= 0) {

			dev_err(&priv->spi->dev, "oscillator start failed!\n");

			return ret;

			return -ETIMEDOUT;

		}

		udelay(1);

	} while (!(status & CC2520_STATUS_XOSC32M_STABLE));

net/mac802154/iface.c

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name, 
	sdata->dev = ndev;

	sdata->wpan_dev.wpan_phy = local->hw.phy;

	sdata->local = local;

	INIT_LIST_HEAD(&sdata->wpan_dev.list);



	/* setup type-dependent data */

	ret = ieee802154_setup_sdata(sdata, type);