diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-11 22:11:50 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-11 22:11:50 -0400 |
| commit | d58b622b5de9747c82fcc3548f3ec87a02c24dce (patch) | |
| tree | ecdd2bc45ab13e3450221fcfaaedd5d286747fad | |
| parent | 1045b03e07d85f3545118510a587035536030c1c (diff) | |
| parent | 7c6a329e444725f24c02192ac493d8a7cd9fa638 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
| -rw-r--r-- | net/bluetooth/hci_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index f5b21cb93699..278a3ace14f6 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c | |||
| @@ -164,6 +164,9 @@ static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev * | |||
| 164 | { | 164 | { |
| 165 | int ret; | 165 | int ret; |
| 166 | 166 | ||
| 167 | if (!test_bit(HCI_UP, &hdev->flags)) | ||
| 168 | return -ENETDOWN; | ||
| 169 | |||
| 167 | /* Serialize all requests */ | 170 | /* Serialize all requests */ |
| 168 | hci_req_lock(hdev); | 171 | hci_req_lock(hdev); |
| 169 | ret = __hci_request(hdev, req, opt, timeout); | 172 | ret = __hci_request(hdev, req, opt, timeout); |