diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/bluetooth/hci_bcsp.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/bluetooth/hci_bcsp.c')
| -rw-r--r-- | drivers/bluetooth/hci_bcsp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 0a4761415ac3..8fddfdfd0fbd 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c | |||
| @@ -715,10 +715,9 @@ static int bcsp_open(struct hci_uart *hu) | |||
| 715 | 715 | ||
| 716 | BT_DBG("hu %p", hu); | 716 | BT_DBG("hu %p", hu); |
| 717 | 717 | ||
| 718 | bcsp = kmalloc(sizeof(*bcsp), GFP_ATOMIC); | 718 | bcsp = kzalloc(sizeof(*bcsp), GFP_ATOMIC); |
| 719 | if (!bcsp) | 719 | if (!bcsp) |
| 720 | return -ENOMEM; | 720 | return -ENOMEM; |
| 721 | memset(bcsp, 0, sizeof(*bcsp)); | ||
| 722 | 721 | ||
| 723 | hu->priv = bcsp; | 722 | hu->priv = bcsp; |
| 724 | skb_queue_head_init(&bcsp->unack); | 723 | skb_queue_head_init(&bcsp->unack); |