diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2012-01-07 15:19:37 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 16:01:22 +0100 |
| commit | 9eb648c39af8c14cb63fc9ccfc9a52cdb4442daa (patch) | |
| tree | 345be044ee787b5cd305e47f0ccef307a2e0ab29 /drivers/bluetooth/hci_ll.c | |
| parent | Bluetooth: Fix using an absolute timeout on hci_conn_put() (diff) | |
| download | linux-9eb648c39af8c14cb63fc9ccfc9a52cdb4442daa.tar.xz linux-9eb648c39af8c14cb63fc9ccfc9a52cdb4442daa.zip | |
Bluetooth: hci-uart-ll: Use GFP_ATOMIC in open()
The uart_proto open() callback is not called in atomic context so we can safely
sleep here. The caller hci_uart_set_proto() in hci_ldisc.c is an ioctl() handler
and therefore can sleep.
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth/hci_ll.c')
| -rw-r--r-- | drivers/bluetooth/hci_ll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index 7e4b435f79f0..b874c0efde24 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c @@ -125,7 +125,7 @@ static int ll_open(struct hci_uart *hu) BT_DBG("hu %p", hu); - ll = kzalloc(sizeof(*ll), GFP_ATOMIC); + ll = kzalloc(sizeof(*ll), GFP_KERNEL); if (!ll) return -ENOMEM; |