summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2014-11-02 08:15:39 +0100
committerJohan Hedberg <johan.hedberg@intel.com>2014-11-02 10:03:51 +0200
commit882809fb724c46b8ebc4de0944e94914ceb94e1c (patch)
tree33d68f35c715967571a7235d1132efbcf75989d9 /drivers/bluetooth
parent75e0569f7fc22272ec5e3b99bf94c6f0ad43b35f (diff)
downloadop-kernel-dev-882809fb724c46b8ebc4de0944e94914ceb94e1c.zip
op-kernel-dev-882809fb724c46b8ebc4de0944e94914ceb94e1c.tar.gz
Bluetooth: Switch HCI H5 driver to use hci_reset_dev() function
Instead of having the driver generate the HCI Hardware Error event manually, just call hci_reset_dev() to trigger the upper stack reset. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/hci_h5.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index bd1fe37..ec0fa77 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -171,8 +171,6 @@ wakeup:
static void h5_peer_reset(struct hci_uart *hu)
{
struct h5 *h5 = hu->priv;
- struct sk_buff *skb;
- const u8 hw_err[] = { HCI_EV_HARDWARE_ERROR, 0x01, 0x00 };
BT_ERR("Peer device has reset");
@@ -187,15 +185,8 @@ static void h5_peer_reset(struct hci_uart *hu)
h5->tx_seq = 0;
h5->tx_ack = 0;
- skb = bt_skb_alloc(3, GFP_ATOMIC);
- if (!skb)
- return;
-
- bt_cb(skb)->pkt_type = HCI_EVENT_PKT;
- memcpy(skb_put(skb, 3), hw_err, 3);
-
- /* Send Hardware Error to upper stack */
- hci_recv_frame(hu->hdev, skb);
+ /* Send reset request to upper stack */
+ hci_reset_dev(hu->hdev);
}
static int h5_open(struct hci_uart *hu)
OpenPOWER on IntegriCloud