diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-03 13:11:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-03 13:11:36 +0200 |
| commit | cce81eac7fd0852d96ce0ce62cbe8f2b76d227f5 (patch) | |
| tree | b3ec5c9b08f41581185754ac199f0dcb9d6dda95 /0015-tty-n_r3964-add-reference-counting-to-the-client-str.patch | |
| parent | 4a11ea0818f9d84b7b29693f27adaa5d020ffe25 (diff) | |
| download | patches-cce81eac7fd0852d96ce0ce62cbe8f2b76d227f5.tar.gz | |
update readfile and other patches to 5.12-rc5
Diffstat (limited to '0015-tty-n_r3964-add-reference-counting-to-the-client-str.patch')
| -rw-r--r-- | 0015-tty-n_r3964-add-reference-counting-to-the-client-str.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0015-tty-n_r3964-add-reference-counting-to-the-client-str.patch b/0015-tty-n_r3964-add-reference-counting-to-the-client-str.patch index ec31e9dbb8b167..862be5f5310f93 100644 --- a/0015-tty-n_r3964-add-reference-counting-to-the-client-str.patch +++ b/0015-tty-n_r3964-add-reference-counting-to-the-client-str.patch @@ -201,7 +201,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> } /* Remove jobs from tx_queue: */ spin_lock_irqsave(&pInfo->lock, flags); -@@ -1173,6 +1218,7 @@ static ssize_t r3964_read(struct tty_str +@@ -1171,6 +1216,7 @@ static ssize_t r3964_read(struct tty_str ret = -EPERM; unlock: mutex_unlock(&pInfo->read_lock); @@ -209,7 +209,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> return ret; } -@@ -1181,7 +1227,6 @@ static ssize_t r3964_write(struct tty_st +@@ -1179,7 +1225,6 @@ static ssize_t r3964_write(struct tty_st { struct r3964_info *pInfo = tty->disc_data; struct tx_block_header *pHeader; @@ -217,7 +217,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> unsigned char *new_data; TRACE_L("write request, %d characters", count); -@@ -1217,12 +1262,12 @@ static ssize_t r3964_write(struct tty_st +@@ -1215,12 +1260,12 @@ static ssize_t r3964_write(struct tty_st pHeader = (struct tx_block_header *)new_data; pHeader->data = new_data + sizeof(*pHeader); pHeader->length = count; @@ -235,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> memcpy(pHeader->data, data, count); /* We already verified this */ -@@ -1333,6 +1378,7 @@ static __poll_t r3964_poll(struct tty_st +@@ -1331,6 +1376,7 @@ static __poll_t r3964_poll(struct tty_st if (!list_empty(&pClient->msgs)) result |= EPOLLIN | EPOLLRDNORM; spin_unlock_irqrestore(&pClient->lock, flags); |