|
@@ -124,7 +124,7 @@ static void hci_req_cancel(struct hci_dev *hdev, int err)
|
|
|
|
|
|
/* Execute request and wait for completion. */
|
|
|
static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt),
|
|
|
- unsigned long opt, __u32 timeout)
|
|
|
+ unsigned long opt, __u32 timeout)
|
|
|
{
|
|
|
DECLARE_WAITQUEUE(wait, current);
|
|
|
int err = 0;
|
|
@@ -166,7 +166,7 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev,
|
|
|
}
|
|
|
|
|
|
static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt),
|
|
|
- unsigned long opt, __u32 timeout)
|
|
|
+ unsigned long opt, __u32 timeout)
|
|
|
{
|
|
|
int ret;
|
|
|
|
|
@@ -465,7 +465,7 @@ int hci_inquiry(void __user *arg)
|
|
|
/* cache_dump can't sleep. Therefore we allocate temp buffer and then
|
|
|
* copy it to the user space.
|
|
|
*/
|
|
|
- buf = kmalloc(sizeof(struct inquiry_info) *max_rsp, GFP_KERNEL);
|
|
|
+ buf = kmalloc(sizeof(struct inquiry_info) * max_rsp, GFP_KERNEL);
|
|
|
if (!buf) {
|
|
|
err = -ENOMEM;
|
|
|
goto done;
|
|
@@ -534,7 +534,6 @@ int hci_dev_open(__u16 dev)
|
|
|
set_bit(HCI_INIT, &hdev->flags);
|
|
|
hdev->init_last_cmd = 0;
|
|
|
|
|
|
- //__hci_request(hdev, hci_reset_req, 0, HZ);
|
|
|
ret = __hci_request(hdev, hci_init_req, 0,
|
|
|
msecs_to_jiffies(HCI_INIT_TIMEOUT));
|
|
|
|