Skip to content

Commit 68d90d5

Browse files
Jiri Slaby (SUSE)gregkh
authored andcommitted
tty: n_tty: use 'num' for writes' counts
We have a separate misnomer 'c' to hold the retuned value from tty->ops->write(). Instead, use 'num' already defined on another place (and already properly typed). Signed-off-by: "Jiri Slaby (SUSE)" <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent d414034 commit 68d90d5

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

drivers/tty/n_tty.c

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2335,8 +2335,7 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
23352335
{
23362336
const u8 *b = buf;
23372337
DEFINE_WAIT_FUNC(wait, woken_wake_function);
2338-
int c;
2339-
ssize_t retval = 0;
2338+
ssize_t num, retval = 0;
23402339

23412340
/* Job control check -- must be done at start (POSIX.1 7.1.1.4). */
23422341
if (L_TOSTOP(tty) && file->f_op->write_iter != redirected_tty_write) {
@@ -2362,7 +2361,7 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
23622361
}
23632362
if (O_OPOST(tty)) {
23642363
while (nr > 0) {
2365-
ssize_t num = process_output_block(tty, b, nr);
2364+
num = process_output_block(tty, b, nr);
23662365
if (num < 0) {
23672366
if (num == -EAGAIN)
23682367
break;
@@ -2384,16 +2383,16 @@ static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
23842383

23852384
while (nr > 0) {
23862385
mutex_lock(&ldata->output_lock);
2387-
c = tty->ops->write(tty, b, nr);
2386+
num = tty->ops->write(tty, b, nr);
23882387
mutex_unlock(&ldata->output_lock);
2389-
if (c < 0) {
2390-
retval = c;
2388+
if (num < 0) {
2389+
retval = num;
23912390
goto break_out;
23922391
}
2393-
if (!c)
2392+
if (!num)
23942393
break;
2395-
b += c;
2396-
nr -= c;
2394+
b += num;
2395+
nr -= num;
23972396
}
23982397
}
23992398
if (!nr)

0 commit comments

Comments
 (0)