diff options
| author | David Herrmann <dh.herrmann@googlemail.com> | 2012-01-07 15:19:38 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-13 17:01:22 +0200 |
| commit | fdcd1661a6b22e3ac429759627d2b4d68f77d64a (patch) | |
| tree | 6d641f4cd3a7a51258fd67415e2b1002162ed5ea /drivers/bluetooth | |
| parent | 9eb648c39af8c14cb63fc9ccfc9a52cdb4442daa (diff) | |
| download | linux-fdcd1661a6b22e3ac429759627d2b4d68f77d64a.tar.gz linux-fdcd1661a6b22e3ac429759627d2b4d68f77d64a.tar.bz2 linux-fdcd1661a6b22e3ac429759627d2b4d68f77d64a.zip | |
Bluetooth: hci-uart-h4: 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')
| -rw-r--r-- | drivers/bluetooth/hci_h4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index 2fcd8b387d69..748329468d26 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c @@ -69,7 +69,7 @@ static int h4_open(struct hci_uart *hu) BT_DBG("hu %p", hu); - h4 = kzalloc(sizeof(*h4), GFP_ATOMIC); + h4 = kzalloc(sizeof(*h4), GFP_KERNEL); if (!h4) return -ENOMEM; |