[PATCH v2] serial-port: warn if ioctl(TIOCSSERIAL) fails to set closing_wait

Aleksander Morgado aleksander at lanedo.com
Sun Jul 7 23:48:00 PDT 2013


On 05/07/13 20:09, Ben Chan wrote:
> Prints out a warning if ioctl(TIOCSSERIAL) fails to set closing_wait to
> none. This helps debug issues when a serial driver does not support or
> properly handle closing_wait, which may cause closing of the serial port
> to block.
> ---

Pushed, thanks.


>  src/mm-serial-port.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c
> index 6482835..23a9815 100644
> --- a/src/mm-serial-port.c
> +++ b/src/mm-serial-port.c
> @@ -940,7 +940,9 @@ mm_serial_port_open (MMSerialPort *self, GError **error)
>       */
>      if (ioctl (priv->fd, TIOCGSERIAL, &sinfo) == 0) {
>          sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
> -        ioctl (priv->fd, TIOCSSERIAL, &sinfo);
> +        if (ioctl (priv->fd, TIOCSSERIAL, &sinfo) < 0)
> +            mm_warn ("(%s): couldn't set serial port closing_wait to none: %s",
> +                     device, g_strerror (errno));
>      }
>  
>      g_get_current_time (&tv_end);
> @@ -1030,7 +1032,9 @@ mm_serial_port_close (MMSerialPort *self)
>              if (sinfo.closing_wait != ASYNC_CLOSING_WAIT_NONE) {
>                  mm_warn ("(%s): serial port closing_wait was reset!", device);
>                  sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
> -                (void) ioctl (priv->fd, TIOCSSERIAL, &sinfo);
> +                if (ioctl (priv->fd, TIOCSSERIAL, &sinfo) < 0)
> +                    mm_warn ("(%s): couldn't set serial port closing_wait to none: %s",
> +                             device, g_strerror (errno));
>              }
>          }
>  
> 


-- 
Aleksander


More information about the ModemManager-devel mailing list