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

Commit 1a4e2351 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

cyclades.c: fix sparse shadowed variable warnings 



Nested min() macros.
drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
drivers/char/cyclades.c:2750:7: warning: symbol '_x' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here
drivers/char/cyclades.c:2750:7: warning: symbol '_y' shadows an earlier one
drivers/char/cyclades.c:2750:7: originally declared here

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 709107fc

drivers/char/cyclades.c

+2 −2
Original line number Diff line number Diff line
@@ -2747,8 +2747,8 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count) 


	spin_lock_irqsave(&info->card->card_lock, flags);

	while (1) {

		c = min(count, min((int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1),

				   (int)(SERIAL_XMIT_SIZE - info->xmit_head)));

		c = min(count, (int)(SERIAL_XMIT_SIZE - info->xmit_cnt - 1));

		c = min(c, (int)(SERIAL_XMIT_SIZE - info->xmit_head));



		if (c <= 0)

			break;