diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-21 09:40:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-21 09:40:55 +0100 |
| commit | 3cfade53c77315d018c50ea1ee3420cef1c50fe7 (patch) | |
| tree | d5ae53cb94d00ad205daf3fa8894f5b5c47c0267 /net/nfc | |
| parent | serial: remove sirf prima/atlas driver (diff) | |
| parent | tty: teach the n_tty ICANON case about the new "cookie continuations" too (diff) | |
| download | linux-3cfade53c77315d018c50ea1ee3420cef1c50fe7.tar.xz linux-3cfade53c77315d018c50ea1ee3420cef1c50fe7.zip | |
Merge branch 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into tty-next
Fixes both the "splice/sendfile to a tty" and "splice/sendfile from a
tty" regression from 5.10.
* 'tty-splice' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux:
tty: teach the n_tty ICANON case about the new "cookie continuations" too
tty: teach n_tty line discipline about the new "cookie continuations"
tty: clean up legacy leftovers from n_tty line discipline
tty: implement read_iter
tty: convert tty_ldisc_ops 'read()' function to take a kernel pointer
tty: implement write_iter
Diffstat (limited to 'net/nfc')
| -rw-r--r-- | net/nfc/nci/uart.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c index 11b554ce07ff..1204c438e87d 100644 --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@ -292,7 +292,8 @@ static int nci_uart_tty_ioctl(struct tty_struct *tty, struct file *file, /* We don't provide read/write/poll interface for user space. */ static ssize_t nci_uart_tty_read(struct tty_struct *tty, struct file *file, - unsigned char __user *buf, size_t nr) + unsigned char *buf, size_t nr, + void **cookie, unsigned long offset) { return 0; } |