diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-24 08:08:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-24 08:08:47 +1000 |
| commit | 20f8e032e6dc7053ab803f488e2a8839cd2f69a6 (patch) | |
| tree | 406b662934bffa205d90e9435bf96af7dc1a0cb0 /drivers/tty/tty_buffer.c | |
| parent | ade1ba7346070709856d7e38f8d1a77b7aa710aa (diff) | |
| parent | 5b726e06d6e8309e5c9ef4109a32caf27c71dfc8 (diff) | |
| download | lwn-20f8e032e6dc7053ab803f488e2a8839cd2f69a6.tar.gz lwn-20f8e032e6dc7053ab803f488e2a8839cd2f69a6.zip | |
Backmerge drm-fixes merge into Linus's tree into drm-next.
This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next
Just to resolve some merges to make Daniel's life easier.
Signed-off-by: DAve Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/tty/tty_buffer.c')
| -rw-r--r-- | drivers/tty/tty_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c index 9a479e61791a..3cd31e0d4bd9 100644 --- a/drivers/tty/tty_buffer.c +++ b/drivers/tty/tty_buffer.c @@ -450,7 +450,7 @@ receive_buf(struct tty_struct *tty, struct tty_buffer *head, int count) count = disc->ops->receive_buf2(tty, p, f, count); else { count = min_t(int, count, tty->receive_room); - if (count) + if (count && disc->ops->receive_buf) disc->ops->receive_buf(tty, p, f, count); } return count; |