diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-28 15:09:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-28 15:09:44 +0200 |
| commit | 42e4dab3dbfbf82344ceacacdc039d79feca67a5 (patch) | |
| tree | a2aa74ecd397fbf9fadd14532ad5c3fda034a8ab /0014-tty-n_r3964-properly-reference-count-pids.patch | |
| parent | da8e19abe98d4e2e9c16e1eb508dd059c440bf0a (diff) | |
| download | patches-42e4dab3dbfbf82344ceacacdc039d79feca67a5.tar.gz | |
add new patch and remove ones merged
Diffstat (limited to '0014-tty-n_r3964-properly-reference-count-pids.patch')
| -rw-r--r-- | 0014-tty-n_r3964-properly-reference-count-pids.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/0014-tty-n_r3964-properly-reference-count-pids.patch b/0014-tty-n_r3964-properly-reference-count-pids.patch index 0962fd7154d197..00131e5ac5d75f 100644 --- a/0014-tty-n_r3964-properly-reference-count-pids.patch +++ b/0014-tty-n_r3964-properly-reference-count-pids.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/drivers/tty/n_r3964.c +++ b/drivers/tty/n_r3964.c -@@ -770,6 +770,18 @@ exit: +@@ -769,6 +769,18 @@ exit: return pClient; } @@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> static int enable_signals(struct r3964_info *pInfo, struct pid *pid, int arg) { struct r3964_client_info *pClient; -@@ -1121,7 +1133,7 @@ static ssize_t r3964_read(struct tty_str +@@ -1120,7 +1132,7 @@ static ssize_t r3964_read(struct tty_str return -ERESTARTSYS; } @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (pClient) { pMsg = remove_msg(pClient); if (pMsg == NULL) { -@@ -1208,7 +1220,7 @@ static ssize_t r3964_write(struct tty_st +@@ -1207,7 +1219,7 @@ static ssize_t r3964_write(struct tty_st pHeader->length = count; pHeader->owner = NULL; @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> if (pClient) { pHeader->owner = pClient; } -@@ -1232,6 +1244,7 @@ static int r3964_ioctl(struct tty_struct +@@ -1231,6 +1243,7 @@ static int r3964_ioctl(struct tty_struct unsigned int cmd, unsigned long arg) { struct r3964_info *pInfo = tty->disc_data; @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> unsigned long flags; int retval = 0; -@@ -1249,7 +1262,9 @@ static int r3964_ioctl(struct tty_struct +@@ -1248,7 +1261,9 @@ static int r3964_ioctl(struct tty_struct return -ERESTARTSYS; } @@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> mutex_unlock(&pInfo->read_lock); break; -@@ -1269,8 +1284,9 @@ static int r3964_ioctl(struct tty_struct +@@ -1268,8 +1283,9 @@ static int r3964_ioctl(struct tty_struct spin_unlock_irqrestore(&pInfo->lock, flags); break; case R3964_READ_TELEGRAM: @@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> break; default: retval = -ENOIOCTLCMD; -@@ -1311,7 +1327,7 @@ static __poll_t r3964_poll(struct tty_st +@@ -1310,7 +1326,7 @@ static __poll_t r3964_poll(struct tty_st TRACE_L("POLL"); |