leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Browse Source 
Conflicts:
	drivers/bluetooth/btusb.c
This commit is contained in:
John W. Linville
2014-05-29 13:03:47 -04:00
parent 737be10d8c d7b2545023
commit a5eb1aeb25
13 changed files with 653 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/bluetooth/rfcomm/core.c
View File

@@ -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);