diff options
| -rw-r--r-- | drivers/bluetooth/ath3k.c | 90 |
1 files changed, 64 insertions, 26 deletions
diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index 1472cccfd0b3..4ce270513695 100644 --- a/drivers/bluetooth/ath3k.c +++ b/drivers/bluetooth/ath3k.c @@ -212,16 +212,19 @@ static int ath3k_load_firmware(struct usb_device *udev, BT_DBG("udev %p", udev); + pipe = usb_sndctrlpipe(udev, 0); + send_buf = kmalloc(BULK_SIZE, GFP_KERNEL); if (!send_buf) { BT_ERR("Can't allocate memory chunk for firmware"); return -ENOMEM; } - err = usb_control_msg_send(udev, 0, USB_REQ_DFU_DNLOAD, USB_TYPE_VENDOR, - 0, 0, firmware->data, FW_HDR_SIZE, - USB_CTRL_SET_TIMEOUT); - if (err) { + memcpy(send_buf, firmware->data, FW_HDR_SIZE); + err = usb_control_msg(udev, pipe, USB_REQ_DFU_DNLOAD, USB_TYPE_VENDOR, + 0, 0, send_buf, FW_HDR_SIZE, + USB_CTRL_SET_TIMEOUT); + if (err < 0) { BT_ERR("Can't change to loading configuration err"); goto error; } @@ -256,17 +259,44 @@ error: static int ath3k_get_state(struct usb_device *udev, unsigned char *state) { - return usb_control_msg_recv(udev, 0, ATH3K_GETSTATE, - USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, - state, 1, USB_CTRL_SET_TIMEOUT); + int ret, pipe = 0; + char *buf; + + buf = kmalloc(sizeof(*buf), GFP_KERNEL); + if (!buf) + return -ENOMEM; + + pipe = usb_rcvctrlpipe(udev, 0); + ret = usb_control_msg(udev, pipe, ATH3K_GETSTATE, + USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, + buf, sizeof(*buf), USB_CTRL_SET_TIMEOUT); + + *state = *buf; + kfree(buf); + + return ret; } static int ath3k_get_version(struct usb_device *udev, struct ath3k_version *version) { - return usb_control_msg_recv(udev, 0, ATH3K_GETVERSION, - USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, - version, sizeof(*version), USB_CTRL_SET_TIMEOUT); + int ret, pipe = 0; + struct ath3k_version *buf; + const int size = sizeof(*buf); + + buf = kmalloc(size, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + pipe = usb_rcvctrlpipe(udev, 0); + ret = usb_control_msg(udev, pipe, ATH3K_GETVERSION, + USB_TYPE_VENDOR | USB_DIR_IN, 0, 0, + buf, size, USB_CTRL_SET_TIMEOUT); + + memcpy(version, buf, size); + kfree(buf); + + return ret; } static int ath3k_load_fwfile(struct usb_device *udev, @@ -286,10 +316,13 @@ static int ath3k_load_fwfile(struct usb_device *udev, } size = min_t(uint, count, FW_HDR_SIZE); + memcpy(send_buf, firmware->data, size); - ret = usb_control_msg_send(udev, 0, ATH3K_DNLOAD, USB_TYPE_VENDOR, 0, 0, - firmware->data, size, USB_CTRL_SET_TIMEOUT); - if (ret) { + pipe = usb_sndctrlpipe(udev, 0); + ret = usb_control_msg(udev, pipe, ATH3K_DNLOAD, + USB_TYPE_VENDOR, 0, 0, send_buf, + size, USB_CTRL_SET_TIMEOUT); + if (ret < 0) { BT_ERR("Can't change to loading configuration err"); kfree(send_buf); return ret; @@ -322,19 +355,23 @@ static int ath3k_load_fwfile(struct usb_device *udev, return 0; } -static void ath3k_switch_pid(struct usb_device *udev) +static int ath3k_switch_pid(struct usb_device *udev) { - usb_control_msg_send(udev, 0, USB_REG_SWITCH_VID_PID, USB_TYPE_VENDOR, - 0, 0, NULL, 0, USB_CTRL_SET_TIMEOUT); + int pipe = 0; + + pipe = usb_sndctrlpipe(udev, 0); + return usb_control_msg(udev, pipe, USB_REG_SWITCH_VID_PID, + USB_TYPE_VENDOR, 0, 0, + NULL, 0, USB_CTRL_SET_TIMEOUT); } static int ath3k_set_normal_mode(struct usb_device *udev) { unsigned char fw_state; - int ret; + int pipe = 0, ret; ret = ath3k_get_state(udev, &fw_state); - if (ret) { + if (ret < 0) { BT_ERR("Can't get state to change to normal mode err"); return ret; } @@ -344,9 +381,10 @@ static int ath3k_set_normal_mode(struct usb_device *udev) return 0; } - return usb_control_msg_send(udev, 0, ATH3K_SET_NORMAL_MODE, - USB_TYPE_VENDOR, 0, 0, NULL, 0, - USB_CTRL_SET_TIMEOUT); + pipe = usb_sndctrlpipe(udev, 0); + return usb_control_msg(udev, pipe, ATH3K_SET_NORMAL_MODE, + USB_TYPE_VENDOR, 0, 0, + NULL, 0, USB_CTRL_SET_TIMEOUT); } static int ath3k_load_patch(struct usb_device *udev) @@ -359,7 +397,7 @@ static int ath3k_load_patch(struct usb_device *udev) int ret; ret = ath3k_get_state(udev, &fw_state); - if (ret) { + if (ret < 0) { BT_ERR("Can't get state to change to load ram patch err"); return ret; } @@ -370,7 +408,7 @@ static int ath3k_load_patch(struct usb_device *udev) } ret = ath3k_get_version(udev, &fw_version); - if (ret) { + if (ret < 0) { BT_ERR("Can't get version to change to load ram patch err"); return ret; } @@ -411,13 +449,13 @@ static int ath3k_load_syscfg(struct usb_device *udev) int clk_value, ret; ret = ath3k_get_state(udev, &fw_state); - if (ret) { + if (ret < 0) { BT_ERR("Can't get state to change to load configuration err"); return -EBUSY; } ret = ath3k_get_version(udev, &fw_version); - if (ret) { + if (ret < 0) { BT_ERR("Can't get version to change to load ram patch err"); return ret; } @@ -491,7 +529,7 @@ static int ath3k_probe(struct usb_interface *intf, return ret; } ret = ath3k_set_normal_mode(udev); - if (ret) { + if (ret < 0) { BT_ERR("Set normal mode failed"); return ret; } |