mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-3945.h drivers/net/wireless/iwlwifi/iwl-tx.c drivers/net/wireless/iwlwifi/iwl3945-base.c
This commit is contained in:
commit
df597efb57
34 changed files with 185 additions and 104 deletions
|
|
@ -1453,6 +1453,7 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance)
|
|||
}
|
||||
/* Dup */
|
||||
memcpy(new, orig, sizeof(struct tsap_cb));
|
||||
spin_lock_init(&new->lock);
|
||||
|
||||
/* We don't need the old instance any more */
|
||||
spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags);
|
||||
|
|
|
|||
Loading…
Reference in a new issue