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

Commit 93c76c9c authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: dgnc: replace unnecessary while() with if() 



It doesn't need to use while loop for getting newrate,
because it always breaks out the end of while loop with
"break". So just replace while with if.

And the type of newrate is "unsigned int", this type
is never less than zero. If it can be set to negative value by
user application with ioctl(), it is not zero but it
can be a unexpected value for setting custom baudrate.

Also smatch says:
drivers/staging/dgnc/dgnc_tty.c:967 dgnc_set_custom_speed() warn:
 unsigned 'newrate' is never less than zero.
drivers/staging/dgnc/dgnc_tty.c:981 dgnc_set_custom_speed() info:
 ignoring unreachable code.

Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0c31b9b

drivers/staging/dgnc/dgnc_tty.c

+19 −22
Original line number Diff line number Diff line
@@ -964,8 +964,10 @@ static void dgnc_set_custom_speed(struct channel_t *ch, uint newrate) 
	int deltahigh;

	int deltalow;



	if (newrate < 0)

		newrate = 0;

	if (newrate <= 0) {

		ch->ch_custom_speed = 0;

		return;

	}



	/*

	 *  Since the divisor is stored in a 16-bit integer, we make sure
@@ -978,7 +980,7 @@ static void dgnc_set_custom_speed(struct channel_t *ch, uint newrate) 
	if (newrate && newrate > ch->ch_bd->bd_dividend)

		newrate = ch->ch_bd->bd_dividend;



	while (newrate > 0) {

	if (newrate > 0) {

		testdiv = ch->ch_bd->bd_dividend / newrate;



		/*
@@ -995,9 +997,7 @@ static void dgnc_set_custom_speed(struct channel_t *ch, uint newrate) 
		 *  If the rate for the requested divisor is correct, just

		 *  use it and be done.

		 */

		if (testrate_high == newrate )

			break;



		if (testrate_high != newrate) {

			/*

			 *  Otherwise, pick the rate that is closer (i.e. whichever rate

			 *  has a smaller delta).
@@ -1010,13 +1010,10 @@ static void dgnc_set_custom_speed(struct channel_t *ch, uint newrate) 
			} else {

				newrate = testrate_low;

			}



		break;

		}

	}



	ch->ch_custom_speed = newrate;



	return;

}
@@ -3316,10 +3313,10 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, 


	case DIGI_SETCUSTOMBAUD:

	{

		uint new_rate;

		int new_rate;

		/* Let go of locks when accessing user space, could sleep */

		DGNC_UNLOCK(ch->ch_lock, lock_flags);

		rc = get_user(new_rate, (unsigned int __user *) arg);

		rc = get_user(new_rate, (int __user *) arg);

		if (rc)

			return rc;

		DGNC_LOCK(ch->ch_lock, lock_flags);