diff options
| author | David S. Miller <davem@davemloft.net> | 2009-07-30 22:22:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-30 22:22:43 -0400 |
| commit | df597efb5737063497f1a4f7c996cc9aec294230 (patch) | |
| tree | 17bb60f68ee299d9717038197a932501625f1621 /net/irda | |
| parent | a33bc5c15154c835aae26f16e6a3a7d9ad4acb45 (diff) | |
| parent | 0a924578bc4a2823a95c151f56975c71f5c156bb (diff) | |
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
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/irttp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/irda/irttp.c b/net/irda/irttp.c index ecf4eb2717cb..9cb79f95bf63 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c | |||
| @@ -1453,6 +1453,7 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance) | |||
| 1453 | } | 1453 | } |
| 1454 | /* Dup */ | 1454 | /* Dup */ |
| 1455 | memcpy(new, orig, sizeof(struct tsap_cb)); | 1455 | memcpy(new, orig, sizeof(struct tsap_cb)); |
| 1456 | spin_lock_init(&new->lock); | ||
| 1456 | 1457 | ||
| 1457 | /* We don't need the old instance any more */ | 1458 | /* We don't need the old instance any more */ |
| 1458 | spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags); | 1459 | spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags); |