diff options
| author | ronaxdevil <pratabidya.007@gmail.com> | 2020-06-06 12:16:58 +0530 |
|---|---|---|
| committer | lucasponez <lucasponez@outlook.com> | 2020-12-06 05:32:19 -0800 |
| commit | c9d101bffe7b6a10fddc18bc7a2d0dc0962ed71f (patch) | |
| tree | cc92c8d9bbff0f97a4036908f210b2adb2adaf1a /drivers/tty/tty_buffer.c | |
| parent | 13ba6318ccffd7e3167f514ac34358ab74ff6b6c (diff) | |
Merge tag 'v3.18.140' of https://source.codeaurora.org/quic/la/kernel/msm-3.18 into android-10-release-qpk30.54r11.0
This is the 3.18.140 stable release
gpg: Signature made Thu 16 May 2019 12:47:33 PM IST
gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
Signed-off-by: ronaxdevil <pratabidya.007@gmail.com>
Diffstat (limited to 'drivers/tty/tty_buffer.c')
| -rw-r--r-- | drivers/tty/tty_buffer.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c index 9b240b3ef677..a96326b21b64 100644 --- a/drivers/tty/tty_buffer.c +++ b/drivers/tty/tty_buffer.c @@ -25,6 +25,7 @@ * Byte threshold to limit memory consumption for flip buffers. * The actual memory limit is > 2x this amount. */ + #define TTYB_DEFAULT_MEM_LIMIT 131072 /* @@ -415,6 +416,8 @@ receive_buf(struct tty_struct *tty, struct tty_buffer *head, int count) disc->ops->receive_buf(tty, p, f, count); } head->read += count; + if (count > 0) + memset(p, 0, count); return count; } |