iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: rtl8150: Use the new usb control message API.

Browse Source 
The old usb_control_msg() let the caller handle the error and also did not
account for partial reads.  Since these are now considered harmful, move the
driver over to usb_control_msg_recv/send() calls.

Signed-off-by: Petko Manolov <petko.manolov@konsulko.com>
Acked-by: David S. Miller <davem@davemloft.net>
Link: https://lore.kernel.org/r/20200927124909.16380-3-petko.manolov@konsulko.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Petko Manolov 2020-09-27 15:49:09 +03:00 committed by Greg Kroah-Hartman
parent 5789051fc5
commit b2a0f274e3
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/usb/rtl8150.c
View File

@ -152,36 +152,16 @@ static const char driver_name [] = "rtl8150";
*/ */
static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data) static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
{ {
void *buf; return usb_control_msg_recv(dev->udev, 0, RTL8150_REQ_GET_REGS,
int ret; RTL8150_REQT_READ, indx, 0, data, size,
1000, GFP_NOIO);
buf = kmalloc(size, GFP_NOIO);
if (!buf)
return -ENOMEM;
ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
indx, 0, buf, size, 500);
if (ret > 0 && ret <= size)
memcpy(data, buf, ret);
kfree(buf);
return ret;
} }
static int set_registers(rtl8150_t * dev, u16 indx, u16 size, const void *data) static int set_registers(rtl8150_t * dev, u16 indx, u16 size, const void *data)
{ {
void *buf; return usb_control_msg_send(dev->udev, 0, RTL8150_REQ_SET_REGS,
int ret; RTL8150_REQT_WRITE, indx, 0, data, size,
1000, GFP_NOIO);
buf = kmemdup(data, size, GFP_NOIO);
if (!buf)
return -ENOMEM;
ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
indx, 0, buf, size, 500);
kfree(buf);
return ret;
} }
static void async_set_reg_cb(struct urb *urb) static void async_set_reg_cb(struct urb *urb)