Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 527063ba authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

[PATCH] tty_io.c: keep davej sane 



Just comment and next "while" look _very_ wrong.  Place { correctly to hint
unsuspecting ones that it's the end of the loop actually.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Dave Jones <davej@redhat.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3bc1fa8a

drivers/char/tty_io.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -483,10 +483,9 @@ int tty_insert_flip_string(struct tty_struct *tty, const unsigned char *chars, 
		tb->used += space;

		tb->used += space;

		copied += space;

		copied += space;

		chars += space;

		chars += space;

	}

		/* There is a small chance that we need to split the data over

		/* There is a small chance that we need to split the data over

		   several buffers. If this is the case we must loop */

		   several buffers. If this is the case we must loop */

	while (unlikely(size > copied));

	} while (unlikely(size > copied));

	return copied;

	return copied;

}

}

EXPORT_SYMBOL(tty_insert_flip_string);

EXPORT_SYMBOL(tty_insert_flip_string);
@@ -521,10 +520,9 @@ int tty_insert_flip_string_flags(struct tty_struct *tty, 
		copied += space;

		copied += space;

		chars += space;

		chars += space;

		flags += space;

		flags += space;

	}

		/* There is a small chance that we need to split the data over

		/* There is a small chance that we need to split the data over

		   several buffers. If this is the case we must loop */

		   several buffers. If this is the case we must loop */

	while (unlikely(size > copied));

	} while (unlikely(size > copied));

	return copied;

	return copied;

}

}

EXPORT_SYMBOL(tty_insert_flip_string_flags);

EXPORT_SYMBOL(tty_insert_flip_string_flags);