diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:26:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-02 11:26:07 +0800 |
| commit | 9440e4b9fa1c6d76f3c8e11e0887218c9894bf4b (patch) | |
| tree | 940d9ee8e703936e48ba43c40d3e3488c54a30f7 /drivers/usb/serial/cp210x.c | |
| parent | 4eed929a29a419e367b75ff5e4ab3800d4ce35dd (diff) | |
| parent | a5e9874fc9e05e8471bfd58cabd75a3432d38ba6 (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-rtlsk-v4.1-16.12-rt
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
| -rw-r--r-- | drivers/usb/serial/cp210x.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index f49e859ac5ce..6d4d8b828971 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c @@ -844,7 +844,9 @@ static int cp210x_tiocmget(struct tty_struct *tty) unsigned int control; int result; - cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1); + result = cp210x_get_config(port, CP210X_GET_MDMSTS, &control, 1); + if (result) + return result; result = ((control & CONTROL_DTR) ? TIOCM_DTR : 0) |((control & CONTROL_RTS) ? TIOCM_RTS : 0) |