On Thu, Mar 14, 2013 at 10:30:02PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 14-03-2013 19:24, Johan Hovold wrote:
>
> > Always try to disable the uart on close.
>
> > Since the switch to tty ports, close will be called as part of shutdown
> > before disconnect returns. Hence there is no need to check the
> > disconnected flag, and we can put devices in disabled states also on
> > driver unbind.
>
> > Signed-off-by: Johan Hovold <jhovold@xxxxxxxxx>
> > ---
> > drivers/usb/serial/kl5kusb105.c | 13 +++++--------
> > 1 file changed, 5 insertions(+), 8 deletions(-)
>
> > diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
> > index 57fd001..7acea70 100644
> > --- a/drivers/usb/serial/kl5kusb105.c
> > +++ b/drivers/usb/serial/kl5kusb105.c
> > @@ -341,22 +341,19 @@ static void klsi_105_close(struct usb_serial_port *port)
> > {
> > int rc;
> >
> > - mutex_lock(&port->serial->disc_mutex);
> > - if (!port->serial->disconnected) {
> > - /* send READ_OFF */
> > - rc = usb_control_msg(port->serial->dev,
> > - usb_sndctrlpipe(port->serial->dev, 0),
> > + /* send READ_OFF */
> > + rc = usb_control_msg(port->serial->dev,
> > + usb_sndctrlpipe(port->serial->dev, 0),
> > KL5KUSB105A_SIO_CONFIGURE,
> > USB_TYPE_VENDOR | USB_DIR_OUT,
> > KL5KUSB105A_SIO_CONFIGURE_READ_OFF,
> > 0, /* index */
> > NULL, 0,
> > KLSI_TIMEOUT);
>
> I think you should reindent the reset of the parameters too.
No, there's no need. I should have kept the usb_sndctrlpipe indentation
as well though, but I doubt that that's important enough to respin the
series, unless Greg is of a different opinion.
> > - if (rc < 0)
> > - dev_err(&port->dev,
> > + if (rc < 0) {
> > + dev_err(&port->dev,
> > "Disabling read failed (error = %d)\n", rc);
>
> And properly indent string here too.
It is properly indented (<80 cols and no broken string constants).
Putting it all on one line would make 81 chars. :)
Thanks,
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
