diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:33:05 -0400 |
| commit | c97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch) | |
| tree | eb2060681552a00e9efa98224b95f69a3dc84390 /net/bluetooth/hci_core.c | |
| parent | b1add0480a95b6ceaece5caf6c50614771eae9b2 (diff) | |
| parent | 7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff) | |
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -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); |