diff options
| author | Renato Botelho <renato@netgate.com> | 2016-06-06 08:05:51 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-06-06 08:05:51 -0300 |
| commit | 47dfb8d658406ebf07225c0104ebe4be06ae405f (patch) | |
| tree | 83174cbd9592560c48ad2cd11afe42c5c12b6c1b /sys/compat/linux/linux_ioctl.c | |
| parent | 131cd15b13bbd3e141e911a65cf7a1895ec6ab05 (diff) | |
| parent | 13d657a35d96e65f1be391830f36e1adff33534f (diff) | |
| download | FreeBSD-src-47dfb8d658406ebf07225c0104ebe4be06ae405f.zip FreeBSD-src-47dfb8d658406ebf07225c0104ebe4be06ae405f.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/compat/linux/linux_ioctl.c')
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 8858e2f..7185a12 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -915,6 +915,8 @@ linux_ioctl_termio(struct thread *td, struct linux_ioctl_args *args) case LINUX_TIOCGSERIAL: { struct linux_serial_struct lss; + + bzero(&lss, sizeof(lss)); lss.type = LINUX_PORT_16550A; lss.flags = 0; lss.close_delay = 0; @@ -976,7 +978,7 @@ linux_ioctl_termio(struct thread *td, struct linux_ioctl_args *args) error = fo_ioctl(fp, TIOCGETD, (caddr_t)&bsd_line, td->td_ucred, td); if (error) - return (error); + break; switch (bsd_line) { case TTYDISC: linux_line = LINUX_N_TTY; |
