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

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.orgSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 4fad22a1 b3d72d31
...@@ -885,7 +885,7 @@ static int ca8210_spi_transfer( ...@@ -885,7 +885,7 @@ static int ca8210_spi_transfer(
dev_dbg(&spi->dev, "%s called\n", __func__); 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) if (!cas_ctl)
return -ENOMEM; return -ENOMEM;
......
...@@ -970,7 +970,7 @@ static int cc2520_hw_init(struct cc2520_private *priv) ...@@ -970,7 +970,7 @@ static int cc2520_hw_init(struct cc2520_private *priv)
if (timeout-- <= 0) { if (timeout-- <= 0) {
dev_err(&priv->spi->dev, "oscillator start failed!\n"); dev_err(&priv->spi->dev, "oscillator start failed!\n");
return ret; return -ETIMEDOUT;
} }
udelay(1); udelay(1);
} while (!(status & CC2520_STATUS_XOSC32M_STABLE)); } while (!(status & CC2520_STATUS_XOSC32M_STABLE));
......
...@@ -662,6 +662,7 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name, ...@@ -662,6 +662,7 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name,
sdata->dev = ndev; sdata->dev = ndev;
sdata->wpan_dev.wpan_phy = local->hw.phy; sdata->wpan_dev.wpan_phy = local->hw.phy;
sdata->local = local; sdata->local = local;
INIT_LIST_HEAD(&sdata->wpan_dev.list);
/* setup type-dependent data */ /* setup type-dependent data */
ret = ieee802154_setup_sdata(sdata, type); ret = ieee802154_setup_sdata(sdata, type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment