diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-07 22:53:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-07 22:53:48 -0800 |
| commit | 0111ad823e5e261ffc54ef728f1d852760ee4920 (patch) | |
| tree | 3fa6912f040765a447e7b4e25a4918b2d006d7a5 /drivers/bluetooth/hci_ath.c | |
| parent | e427babeefe10023d348e2a3db272612d6e79dc3 (diff) | |
| parent | fdde0a26a218d95e2ea38c0838ab6f24040af14c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/hci_ath.c')
| -rw-r--r-- | drivers/bluetooth/hci_ath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c index 4093935ddf4..12172a6a95c 100644 --- a/drivers/bluetooth/hci_ath.c +++ b/drivers/bluetooth/hci_ath.c @@ -112,7 +112,7 @@ static int ath_open(struct hci_uart *hu) BT_DBG("hu %p", hu); - ath = kzalloc(sizeof(*ath), GFP_ATOMIC); + ath = kzalloc(sizeof(*ath), GFP_KERNEL); if (!ath) return -ENOMEM; |