]> Git Repo - J-linux.git/commitdiff
Merge tag 'usb-serial-5.20-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <[email protected]>
Mon, 25 Jul 2022 09:28:52 +0000 (11:28 +0200)
committerGreg Kroah-Hartman <[email protected]>
Mon, 25 Jul 2022 09:28:52 +0000 (11:28 +0200)
Johan writes:

USB-serial updates for 5.20-rc1

Here are the USB-serial updates for 5.20-rc1, including

 - a fix up of some tty-port initialized comments that had got
   truncated and obfuscated

Included are also various clean ups.

All but the final commit have been in linux-next and with no reported
issues.

* tag 'usb-serial-5.20-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial:
  USB: serial: fix tty-port initialized comments
  USB: serial: fix repeated word "the" in comments
  USB: serial: io_edgeport: fix spelling mistakes
  USB: serial: use kmemdup instead of kmalloc + memcpy

1  2 
drivers/usb/serial/usb_wwan.c

index 6129a6e26f2ce1b798b4894e3469a5db3ea501ee,cc81ab7ef4da15a7e6fab17939718ca8b9fe33c0..0017f6e969e1221be003c061f15fade531ea4f93
@@@ -29,7 -29,6 +29,7 @@@
  #include <linux/bitops.h>
  #include <linux/uaccess.h>
  #include <linux/usb.h>
 +#include <linux/usb/cdc.h>
  #include <linux/usb/serial.h>
  #include <linux/serial.h>
  #include "usb-wwan.h"
@@@ -49,9 -48,9 +49,9 @@@ static int usb_wwan_send_setup(struct u
        portdata = usb_get_serial_port_data(port);
  
        if (portdata->dtr_state)
 -              val |= 0x01;
 +              val |= USB_CDC_CTRL_DTR;
        if (portdata->rts_state)
 -              val |= 0x02;
 +              val |= USB_CDC_CTRL_RTS;
  
        ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
  
@@@ -60,9 -59,8 +60,9 @@@
                return res;
  
        res = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0),
 -                              0x22, 0x21, val, ifnum, NULL, 0,
 -                              USB_CTRL_SET_TIMEOUT);
 +                              USB_CDC_REQ_SET_CONTROL_LINE_STATE,
 +                              USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
 +                              val, ifnum, NULL, 0, USB_CTRL_SET_TIMEOUT);
  
        usb_autopm_put_interface(port->serial->interface);
  
@@@ -390,7 -388,8 +390,8 @@@ void usb_wwan_close(struct usb_serial_p
  
        /*
         * Need to take susp_lock to make sure port is not already being
-        * resumed, but no need to hold it due to initialized
+        * resumed, but no need to hold it due to the tty-port initialized
+        * flag.
         */
        spin_lock_irq(&intfdata->susp_lock);
        if (--intfdata->open_ports == 0)
This page took 0.058954 seconds and 4 git commands to generate.