diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-22 14:25:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-22 14:25:23 -0800 |
| commit | 38c0ecf6087a8cb2af24ddd2124e9ca3c666dcdf (patch) | |
| tree | 3ad69a04b14d7147e1dfa19dbd7f48974c53f19c | |
| parent | 94f82008ce30e2624537d240d64ce718255e0b80 (diff) | |
| parent | 9bc30ab82108e6a34dc63bf956b49edf71b1681a (diff) | |
| download | linux-stable-38c0ecf6087a8cb2af24ddd2124e9ca3c666dcdf.tar.gz linux-stable-38c0ecf6087a8cb2af24ddd2124e9ca3c666dcdf.tar.bz2 linux-stable-38c0ecf6087a8cb2af24ddd2124e9ca3c666dcdf.zip | |
Merge tag 'auxdisplay-for-linus-v4.20' of https://github.com/ojeda/linux
Pull auxdisplay fix from Miguel Ojeda:
"charlcd: fix x/y command parsing (Mans Rullgard)"
* tag 'auxdisplay-for-linus-v4.20' of https://github.com/ojeda/linux:
auxdisplay: charlcd: fix x/y command parsing
| -rw-r--r-- | drivers/auxdisplay/charlcd.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/auxdisplay/charlcd.c b/drivers/auxdisplay/charlcd.c index 81c22d20d9d9..60e0b772673f 100644 --- a/drivers/auxdisplay/charlcd.c +++ b/drivers/auxdisplay/charlcd.c @@ -538,6 +538,9 @@ static inline int handle_lcd_special_code(struct charlcd *lcd) } case 'x': /* gotoxy : LxXXX[yYYY]; */ case 'y': /* gotoxy : LyYYY[xXXX]; */ + if (priv->esc_seq.buf[priv->esc_seq.len - 1] != ';') + break; + /* If the command is valid, move to the new address */ if (parse_xy(esc, &priv->addr.x, &priv->addr.y)) charlcd_gotoxy(lcd); |