diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-29 13:03:47 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-29 13:03:47 -0400 |
| commit | a5eb1aeb25df89c627248a162cc35ffb556dc486 (patch) | |
| tree | 934fd6b18f17f72d5e57708b8e3a12b0071f1327 /net/bluetooth/rfcomm/core.c | |
| parent | 737be10d8cb783d1cadb1868b061abb2b4314eae (diff) | |
| parent | d7b2545023ecfde94d3ea9c03c5480ac18da96c9 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Conflicts:
drivers/bluetooth/btusb.c
Diffstat (limited to 'net/bluetooth/rfcomm/core.c')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index cf620260affa..754b6fe4f742 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -307,7 +307,7 @@ struct rfcomm_dlc *rfcomm_dlc_alloc(gfp_t prio) setup_timer(&d->timer, rfcomm_dlc_timeout, (unsigned long)d); skb_queue_head_init(&d->tx_queue); - spin_lock_init(&d->lock); + mutex_init(&d->lock); atomic_set(&d->refcnt, 1); rfcomm_dlc_clear_state(d); |