diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-30 23:26:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-30 23:26:45 -0700 |
| commit | 9d52bf0a238657ebfddaf5976409ac33174b9f78 (patch) | |
| tree | 4bab8453a145bdb38eaea6d83c2368d6a7f7ce2c /net/bluetooth/hci_core.c | |
| parent | 1dcf3ac49fb0079ed7d3d3f4a4cf25e9fb9fffc6 (diff) | |
| parent | b5a61c306b0dddb28e3a3ab5d782c73e5f665497 (diff) | |
| download | linux-stable-9d52bf0a238657ebfddaf5976409ac33174b9f78.tar.gz linux-stable-9d52bf0a238657ebfddaf5976409ac33174b9f78.tar.bz2 linux-stable-9d52bf0a238657ebfddaf5976409ac33174b9f78.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2015-05-28
Here's a set of patches intended for 4.2. The majority of the changes
are on the 802.15.4 side of things rather than Bluetooth related:
- All sorts of cleanups & fixes to ieee802154 and related drivers
- Rework of tx power support in ieee802154 and its drivers
- Support for setting ieee802154 tx power through nl802154
- New IDs for the btusb driver
- Various cleanups & smaller fixes to btusb
- New btrtl driver for Realtec devices
- Fix suspend/resume for Realtek devices
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index c4802f3bd4c5..f6c99098959f 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -94,7 +94,6 @@ static ssize_t dut_mode_write(struct file *file, const char __user *user_buf, char buf[32]; size_t buf_size = min(count, (sizeof(buf)-1)); bool enable; - int err; if (!test_bit(HCI_UP, &hdev->flags)) return -ENETDOWN; @@ -121,12 +120,8 @@ static ssize_t dut_mode_write(struct file *file, const char __user *user_buf, if (IS_ERR(skb)) return PTR_ERR(skb); - err = -bt_to_errno(skb->data[0]); kfree_skb(skb); - if (err < 0) - return err; - hci_dev_change_flag(hdev, HCI_DUT_MODE); return count; |