diff options
| author | David S. Miller | 2017-09-03 21:27:55 -0700 |
|---|---|---|
| committer | David S. Miller | 2017-09-03 21:27:55 -0700 |
| commit | 45865dabb14cee3be334c1376d69e959a62af561 (patch) | |
| tree | 8393f518846dd2470aa28b24e6c54c90f6104bd6 /drivers/net | |
| parent | f98ce38927d53e84960fbc5f7789d5ad6126b076 (diff) | |
| parent | 65bce46298d064dff9db1282e17bb26602715819 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-09-03
Here's one last bluetooth-next pull request for the 4.14 kernel:
- NULL pointer fix in ca8210 802.15.4 driver
- A few "const" fixes
- New Kconfig option for disabling legacy interfaces
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ieee802154/ca8210.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c index 326243fae7e2..24a1eabbbc9d 100644 --- a/drivers/net/ieee802154/ca8210.c +++ b/drivers/net/ieee802154/ca8210.c @@ -917,10 +917,7 @@ static int ca8210_spi_transfer( struct cas_control *cas_ctl; if (!spi) { - dev_crit( - &spi->dev, - "NULL spi device passed to ca8210_spi_transfer\n" - ); + pr_crit("NULL spi device passed to %s\n", __func__); return -ENODEV; } |