aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@googlemail.com>2012-01-07 09:19:37 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:22 -0500
commit9eb648c39af8c14cb63fc9ccfc9a52cdb4442daa (patch)
tree345be044ee787b5cd305e47f0ccef307a2e0ab29 /drivers
parent1931782b67bd1b81007022e8311669c40bb7d5b1 (diff)
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')
-rw-r--r--drivers/bluetooth/hci_ll.c2
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)
125 125
126 BT_DBG("hu %p", hu); 126 BT_DBG("hu %p", hu);
127 127
128 ll = kzalloc(sizeof(*ll), GFP_ATOMIC); 128 ll = kzalloc(sizeof(*ll), GFP_KERNEL);
129 if (!ll) 129 if (!ll)
130 return -ENOMEM; 130 return -ENOMEM;
131 131