diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-01 17:42:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-01 17:42:58 -0700 |
| commit | 906a039d2f92c910e5c79a52da018b262bcd73b2 (patch) | |
| tree | 1353a895f843176d47b4456af042b67713475336 /drivers/net | |
| parent | c613c209c3f351d47158f728271d0c73b6dd24c6 (diff) | |
| parent | d829b9e230f4138fb6194e854e1bb46f737f1c3d (diff) | |
| download | linux-906a039d2f92c910e5c79a52da018b262bcd73b2.tar.bz2 | |
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-08-01
Here's our first batch of Bluetooth patches for the 4.14 kernel:
- Several new USB IDs for the btusb driver
- Memory leak fix in btusb driver
- Cleanups & fixes to hci_nokia, hci_serdev and hci_bcm drivers
- Fixed cleanup path in mrf24j40 (802.15.4) driver probe function
- A few other smaller cleanups & fixes to drivers
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/mrf24j40.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 7d334963dc08..ee7084b2d52d 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -1330,7 +1330,8 @@ static int mrf24j40_probe(struct spi_device *spi) if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) { dev_warn(&spi->dev, "spi clock above possible maximum: %d", MAX_SPI_SPEED_HZ); - return -EINVAL; + ret = -EINVAL; + goto err_register_device; } ret = mrf24j40_hw_init(devrec); |