| Message ID | 20240609225850.3900-2-d.smirnov@inbox.lv |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: mos7840: Fix hangup after resume | expand |
On Mon, Jun 10, 2024 at 01:58:50AM +0300, Dmitry Smirnov wrote: > Signed-off-by: Dmitry Smirnov <d.smirnov@inbox.lv> > --- Sorry, but we can't take patches with no changelog text for obvious reasons. greg k-h
On 6/10/24 1:58 AM, Dmitry Smirnov wrote: No description? > Signed-off-by: Dmitry Smirnov <d.smirnov@inbox.lv> > --- > V1 -> V2: Addressed review comments I think this won't do, you need to be more detailed. > drivers/usb/serial/mos7840.c | 50 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) > > diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c > index 8b0308d84270..30c5b09a4409 100644 > --- a/drivers/usb/serial/mos7840.c > +++ b/drivers/usb/serial/mos7840.c > @@ -1737,6 +1737,54 @@ static void mos7840_port_remove(struct usb_serial_port *port) > kfree(mos7840_port); > } > > +static int mos7840_suspend(struct usb_serial *serial, pm_message_t message) > +{ > + struct moschip_port *mos7840_port; > + struct usb_serial_port *port; > + int i; You need an empty line here... > + dev_dbg(&serial->interface->dev, "mos7840_suspend\n"); > + [...] > +static int mos7840_resume(struct usb_serial *serial) > +{ > + struct moschip_port *mos7840_port; > + struct usb_serial_port *port; > + int res; > + int i; And here... > + dev_dbg(&serial->interface->dev, "mos7840_resume\n"); > + > + for (i = 0; i < serial->num_ports; ++i) { > + port = serial->port[i]; > + if (!tty_port_initialized(&port->port)) > + continue; > + > + mos7840_port = usb_get_serial_port_data(port); > + > + if (port->bulk_in_size) { > + res = usb_submit_urb(mos7840_port->read_urb, GFP_NOIO); Contrariwise, the empty line here doesn't seem justified. > + > + if (res) { > + usb_kill_urb(mos7840_port->read_urb); > + mos7840_port->read_urb_busy = false; > + } > + } > + } > + > + return 0; > +} > + > static struct usb_serial_driver moschip7840_4port_device = { > .driver = { > .owner = THIS_MODULE, [...] MBR, Sergey
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 8b0308d84270..30c5b09a4409 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1737,6 +1737,54 @@ static void mos7840_port_remove(struct usb_serial_port *port) kfree(mos7840_port); } +static int mos7840_suspend(struct usb_serial *serial, pm_message_t message) +{ + struct moschip_port *mos7840_port; + struct usb_serial_port *port; + int i; + dev_dbg(&serial->interface->dev, "mos7840_suspend\n"); + + for (i = 0; i < serial->num_ports; ++i) { + port = serial->port[i]; + if (!tty_port_initialized(&port->port)) + continue; + + mos7840_port = usb_get_serial_port_data(port); + + usb_kill_urb(mos7840_port->read_urb); + mos7840_port->read_urb_busy = false; + } + return 0; +} + +static int mos7840_resume(struct usb_serial *serial) +{ + struct moschip_port *mos7840_port; + struct usb_serial_port *port; + int res; + int i; + dev_dbg(&serial->interface->dev, "mos7840_resume\n"); + + for (i = 0; i < serial->num_ports; ++i) { + port = serial->port[i]; + if (!tty_port_initialized(&port->port)) + continue; + + mos7840_port = usb_get_serial_port_data(port); + + if (port->bulk_in_size) { + res = usb_submit_urb(mos7840_port->read_urb, GFP_NOIO); + + if (res) { + usb_kill_urb(mos7840_port->read_urb); + mos7840_port->read_urb_busy = false; + } + } + } + + return 0; +} + static struct usb_serial_driver moschip7840_4port_device = { .driver = { .owner = THIS_MODULE, @@ -1764,6 +1812,8 @@ static struct usb_serial_driver moschip7840_4port_device = { .port_probe = mos7840_port_probe, .port_remove = mos7840_port_remove, .read_bulk_callback = mos7840_bulk_in_callback, + .suspend = mos7840_suspend, + .resume = mos7840_resume, }; static struct usb_serial_driver * const serial_drivers[] = {
Signed-off-by: Dmitry Smirnov <d.smirnov@inbox.lv> --- V1 -> V2: Addressed review comments drivers/usb/serial/mos7840.c | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+)