diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2013-08-14 16:23:39 +0530 |
|---|---|---|
| committer | Deepak Nibade <dnibade@nvidia.com> | 2013-08-14 16:23:39 +0530 |
| commit | 9282699d7fd7954f11d59254e568e5d4bfbbe71a (patch) | |
| tree | 4d945260bc8eb63b0db0423ad55ad7021eb5d4ac /net/bluetooth/hci_core.c | |
| parent | 933d6b11dbd7fda89ac094321d0cd9992afb5592 (diff) | |
| parent | 67e6589a34ea5360b00869aaaec4a844c29cf713 (diff) | |
Merge branch 'linux-3.4.57' into rel-17
Bug 1348440
Change-Id: If25c49f027dc2a69642f7ed4733e965962b2a5a2
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Diffstat (limited to 'net/bluetooth/hci_core.c')
| -rw-r--r-- | net/bluetooth/hci_core.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index a1365e065799..ffa8b0a7705e 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -1136,11 +1136,15 @@ EXPORT_SYMBOL(hci_free_dev); static void hci_power_on(struct work_struct *work) { struct hci_dev *hdev = container_of(work, struct hci_dev, power_on); + int err; BT_DBG("%s", hdev->name); - if (hci_dev_open(hdev->id) < 0) + err = hci_dev_open(hdev->id); + if (err < 0) { + mgmt_set_powered_failed(hdev, err); return; + } if (test_bit(HCI_AUTO_OFF, &hdev->dev_flags)) schedule_delayed_work(&hdev->power_off, |