diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2012-01-07 15:19:39 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 17:01:22 +0200 |
| commit | c063af346d89be16e38385e55e5630070d6fd512 (patch) | |
| tree | 4e825999a93fb744232339d400ab349c657cf72d | |
| parent | fdcd1661a6b22e3ac429759627d2b4d68f77d64a (diff) | |
| download | olio-linux-3.10-c063af346d89be16e38385e55e5630070d6fd512.tar.xz olio-linux-3.10-c063af346d89be16e38385e55e5630070d6fd512.zip | |
Bluetooth: hci-uart-bcsp: 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>
| -rw-r--r-- | drivers/bluetooth/hci_bcsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 9c5b2dc38e2..8bf0c3e774e 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c @@ -692,7 +692,7 @@ static int bcsp_open(struct hci_uart *hu) BT_DBG("hu %p", hu); - bcsp = kzalloc(sizeof(*bcsp), GFP_ATOMIC); + bcsp = kzalloc(sizeof(*bcsp), GFP_KERNEL); if (!bcsp) return -ENOMEM; |