mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-03-17 20:54:10 +00:00
Bluetooth: ath3k: use usb_control_msg_send() and usb_control_msg_recv()
The usb_control_msg_send() and usb_control_msg_recv() calls can return an error if a "short" write/read happens, and they can handle data off of the stack, so move the driver over to using those calls instead, saving some logic when dynamically allocating memory. v2: changed API of use usb_control_msg_send() and usb_control_msg_recv() Cc: Marcel Holtmann <marcel@holtmann.org> Cc: Johan Hedberg <johan.hedberg@gmail.com> Link: https://lore.kernel.org/r/20200914153756.3412156-11-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lore.kernel.org/r/20200923134348.23862-15-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
10fbd979bd
commit
dbb29de70a
1 changed files with 29 additions and 64 deletions
|
@ -212,19 +212,16 @@ static int ath3k_load_firmware(struct usb_device *udev,
|
||||||
|
|
||||||
BT_DBG("udev %p", udev);
|
BT_DBG("udev %p", udev);
|
||||||
|
|
||||||
pipe = usb_sndctrlpipe(udev, 0);
|
|
||||||
|
|
||||||
send_buf = kmalloc(BULK_SIZE, GFP_KERNEL);
|
send_buf = kmalloc(BULK_SIZE, GFP_KERNEL);
|
||||||
if (!send_buf) {
|
if (!send_buf) {
|
||||||
BT_ERR("Can't allocate memory chunk for firmware");
|
BT_ERR("Can't allocate memory chunk for firmware");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(send_buf, firmware->data, FW_HDR_SIZE);
|
err = usb_control_msg_send(udev, 0, USB_REQ_DFU_DNLOAD, USB_TYPE_VENDOR,
|
||||||
err = usb_control_msg(udev, pipe, USB_REQ_DFU_DNLOAD, USB_TYPE_VENDOR,
|
0, 0, firmware->data, FW_HDR_SIZE,
|
||||||
0, 0, send_buf, FW_HDR_SIZE,
|
USB_CTRL_SET_TIMEOUT, GFP_KERNEL);
|
||||||
USB_CTRL_SET_TIMEOUT);
|
if (err) {
|
||||||
if (err < 0) {
|
|
||||||
BT_ERR("Can't change to loading configuration err");
|
BT_ERR("Can't change to loading configuration err");
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
@ -259,44 +256,19 @@ error:
|
||||||
|
|
||||||
static int ath3k_get_state(struct usb_device *udev, unsigned char *state)
|
static int ath3k_get_state(struct usb_device *udev, unsigned char *state)
|
||||||
{
|
{
|
||||||
int ret, pipe = 0;
|
return usb_control_msg_recv(udev, 0, ATH3K_GETSTATE,
|
||||||
char *buf;
|
USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||||||
|
state, 1, USB_CTRL_SET_TIMEOUT,
|
||||||
buf = kmalloc(sizeof(*buf), GFP_KERNEL);
|
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,
|
static int ath3k_get_version(struct usb_device *udev,
|
||||||
struct ath3k_version *version)
|
struct ath3k_version *version)
|
||||||
{
|
{
|
||||||
int ret, pipe = 0;
|
return usb_control_msg_recv(udev, 0, ATH3K_GETVERSION,
|
||||||
struct ath3k_version *buf;
|
USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||||||
const int size = sizeof(*buf);
|
version, sizeof(*version), USB_CTRL_SET_TIMEOUT,
|
||||||
|
GFP_KERNEL);
|
||||||
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,
|
static int ath3k_load_fwfile(struct usb_device *udev,
|
||||||
|
@ -316,13 +288,11 @@ static int ath3k_load_fwfile(struct usb_device *udev,
|
||||||
}
|
}
|
||||||
|
|
||||||
size = min_t(uint, count, FW_HDR_SIZE);
|
size = min_t(uint, count, FW_HDR_SIZE);
|
||||||
memcpy(send_buf, firmware->data, size);
|
|
||||||
|
|
||||||
pipe = usb_sndctrlpipe(udev, 0);
|
ret = usb_control_msg_send(udev, 0, ATH3K_DNLOAD, USB_TYPE_VENDOR, 0, 0,
|
||||||
ret = usb_control_msg(udev, pipe, ATH3K_DNLOAD,
|
firmware->data, size, USB_CTRL_SET_TIMEOUT,
|
||||||
USB_TYPE_VENDOR, 0, 0, send_buf,
|
GFP_KERNEL);
|
||||||
size, USB_CTRL_SET_TIMEOUT);
|
if (ret) {
|
||||||
if (ret < 0) {
|
|
||||||
BT_ERR("Can't change to loading configuration err");
|
BT_ERR("Can't change to loading configuration err");
|
||||||
kfree(send_buf);
|
kfree(send_buf);
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -355,23 +325,19 @@ static int ath3k_load_fwfile(struct usb_device *udev,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ath3k_switch_pid(struct usb_device *udev)
|
static void ath3k_switch_pid(struct usb_device *udev)
|
||||||
{
|
{
|
||||||
int pipe = 0;
|
usb_control_msg_send(udev, 0, USB_REG_SWITCH_VID_PID, USB_TYPE_VENDOR,
|
||||||
|
0, 0, NULL, 0, USB_CTRL_SET_TIMEOUT, GFP_KERNEL);
|
||||||
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)
|
static int ath3k_set_normal_mode(struct usb_device *udev)
|
||||||
{
|
{
|
||||||
unsigned char fw_state;
|
unsigned char fw_state;
|
||||||
int pipe = 0, ret;
|
int ret;
|
||||||
|
|
||||||
ret = ath3k_get_state(udev, &fw_state);
|
ret = ath3k_get_state(udev, &fw_state);
|
||||||
if (ret < 0) {
|
if (ret) {
|
||||||
BT_ERR("Can't get state to change to normal mode err");
|
BT_ERR("Can't get state to change to normal mode err");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -381,10 +347,9 @@ static int ath3k_set_normal_mode(struct usb_device *udev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
pipe = usb_sndctrlpipe(udev, 0);
|
return usb_control_msg_send(udev, 0, ATH3K_SET_NORMAL_MODE,
|
||||||
return usb_control_msg(udev, pipe, ATH3K_SET_NORMAL_MODE,
|
USB_TYPE_VENDOR, 0, 0, NULL, 0,
|
||||||
USB_TYPE_VENDOR, 0, 0,
|
USB_CTRL_SET_TIMEOUT, GFP_KERNEL);
|
||||||
NULL, 0, USB_CTRL_SET_TIMEOUT);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ath3k_load_patch(struct usb_device *udev)
|
static int ath3k_load_patch(struct usb_device *udev)
|
||||||
|
@ -397,7 +362,7 @@ static int ath3k_load_patch(struct usb_device *udev)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = ath3k_get_state(udev, &fw_state);
|
ret = ath3k_get_state(udev, &fw_state);
|
||||||
if (ret < 0) {
|
if (ret) {
|
||||||
BT_ERR("Can't get state to change to load ram patch err");
|
BT_ERR("Can't get state to change to load ram patch err");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -408,7 +373,7 @@ static int ath3k_load_patch(struct usb_device *udev)
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = ath3k_get_version(udev, &fw_version);
|
ret = ath3k_get_version(udev, &fw_version);
|
||||||
if (ret < 0) {
|
if (ret) {
|
||||||
BT_ERR("Can't get version to change to load ram patch err");
|
BT_ERR("Can't get version to change to load ram patch err");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -449,13 +414,13 @@ static int ath3k_load_syscfg(struct usb_device *udev)
|
||||||
int clk_value, ret;
|
int clk_value, ret;
|
||||||
|
|
||||||
ret = ath3k_get_state(udev, &fw_state);
|
ret = ath3k_get_state(udev, &fw_state);
|
||||||
if (ret < 0) {
|
if (ret) {
|
||||||
BT_ERR("Can't get state to change to load configuration err");
|
BT_ERR("Can't get state to change to load configuration err");
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = ath3k_get_version(udev, &fw_version);
|
ret = ath3k_get_version(udev, &fw_version);
|
||||||
if (ret < 0) {
|
if (ret) {
|
||||||
BT_ERR("Can't get version to change to load ram patch err");
|
BT_ERR("Can't get version to change to load ram patch err");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -529,7 +494,7 @@ static int ath3k_probe(struct usb_interface *intf,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
ret = ath3k_set_normal_mode(udev);
|
ret = ath3k_set_normal_mode(udev);
|
||||||
if (ret < 0) {
|
if (ret) {
|
||||||
BT_ERR("Set normal mode failed");
|
BT_ERR("Set normal mode failed");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue