diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-24 14:39:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-24 14:39:16 -0400 |
| commit | 791ef39cd18ae2745a63c51a5dbbd23312be0744 (patch) | |
| tree | 195a547ce1bde51ba3f37cd771648c18d84cc947 /drivers/bluetooth/btuart_cs.c | |
| parent | e5a876250d05d9708895da3d5408bdf67f1180f3 (diff) | |
| parent | 0c1abbd1aa0416258881c303a88e618cbca0759c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/btuart_cs.c')
| -rw-r--r-- | drivers/bluetooth/btuart_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 2f510a87b28..35a553a9061 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
| @@ -446,7 +446,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb) | |||
| 446 | case HCI_SCODATA_PKT: | 446 | case HCI_SCODATA_PKT: |
| 447 | hdev->stat.sco_tx++; | 447 | hdev->stat.sco_tx++; |
| 448 | break; | 448 | break; |
| 449 | }; | 449 | } |
| 450 | 450 | ||
| 451 | /* Prepend skb with frame type */ | 451 | /* Prepend skb with frame type */ |
| 452 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); | 452 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); |