Merge tag 'usb-serial-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB-serial updates for v4.11-rc1 These updates include - a new driver for Renesas uPD78F0730-based devices - several fixes of failures to check for short transfers, some of which could lead to minor information leaks, and in one case a loop-condition underflow - a fix of a long-standing regression in the ftdi_sio driver which resulted in excessive bulk-in interrupts - a fix for ftdi_sio line-status over-reporting which could lead to an endless stream of NULL-characters being forwarded to user space - a fix for a regression in the console driver - a fix for another mos7840 NULL-pointer dereference due to a missing endpoint sanity check Included are also some clean ups and fixes for various minor issues, as well as a couple of new device IDs that came in late. All but the final patch have been in linux-next with no reported issues. Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
@@ -450,7 +450,7 @@ static int pl2303_get_line_request(struct usb_serial_port *port,
|
||||
if (ret != 7) {
|
||||
dev_err(&port->dev, "%s - failed: %d\n", __func__, ret);
|
||||
|
||||
if (ret > 0)
|
||||
if (ret >= 0)
|
||||
ret = -EIO;
|
||||
|
||||
return ret;
|
||||
@@ -470,12 +470,8 @@ static int pl2303_set_line_request(struct usb_serial_port *port,
|
||||
ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
|
||||
SET_LINE_REQUEST, SET_LINE_REQUEST_TYPE,
|
||||
0, 0, buf, 7, 100);
|
||||
if (ret != 7) {
|
||||
if (ret < 0) {
|
||||
dev_err(&port->dev, "%s - failed: %d\n", __func__, ret);
|
||||
|
||||
if (ret > 0)
|
||||
ret = -EIO;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
مرجع در شماره جدید
Block a user