diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-05 20:05:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-05 20:05:16 +0300 |
| commit | 84dda2965d2a8d319e5f47cef46697cf9153f272 (patch) | |
| tree | 7070e11698da3f6e8f657ee09604d9141c1c3a02 /include | |
| parent | 6b0b3bda3d77c35fa9cf20067c0b62daff98c042 (diff) | |
| parent | c8ec2041f549e7f2dee0c34d25381be6f7805f99 (diff) | |
| download | linux-84dda2965d2a8d319e5f47cef46697cf9153f272.tar.xz | |
Merge tag 'tty-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver fixes from Greg KH:
"Here are some small serdev and serial fixes for 4.15-rc3. They resolve
some reported problems:
- a number of serdev fixes to resolve crashes
- MIPS build fixes for their serial port
- a new 8250 device id
All of these have been in linux-next for a while with no reported
issues"
* tag 'tty-4.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
MIPS: Add custom serial.h with BASE_BAUD override for generic kernel
serdev: ttyport: fix tty locking in close
serdev: ttyport: fix NULL-deref on hangup
serdev: fix receive_buf return value when no callback
serdev: ttyport: add missing receive_buf sanity checks
serial: 8250_early: Only set divisor if valid clk & baud
serial: 8250_pci: Add Amazon PCI serial device ID
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serdev.h b/include/linux/serdev.h index e69402d4a8ae..d609e6dc5bad 100644 --- a/include/linux/serdev.h +++ b/include/linux/serdev.h @@ -184,7 +184,7 @@ static inline int serdev_controller_receive_buf(struct serdev_controller *ctrl, struct serdev_device *serdev = ctrl->serdev; if (!serdev || !serdev->ops->receive_buf) - return -EINVAL; + return 0; return serdev->ops->receive_buf(serdev, data, count); } |