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

Commit 9ff46047 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

tty: crisv10.c: move assignment out of if () block 



We should not be doing assignments within an if () block
so fix up the code to not do this.

change was created using Coccinelle.

CC: Mikael Starvik <starvik@axis.com>
CC: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 6d4e751e

drivers/tty/serial/crisv10.c

+8 −4
Original line number Diff line number Diff line
@@ -1635,7 +1635,8 @@ alloc_recv_buffer(unsigned int size) 
{

	struct etrax_recv_buffer *buffer;



	if (!(buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC)))

	buffer = kmalloc(sizeof *buffer + size, GFP_ATOMIC);

	if (!buffer)

		return NULL;



	buffer->next = NULL;
@@ -1671,7 +1672,8 @@ add_char_and_flag(struct e100_serial *info, unsigned char data, unsigned char fl 
{

	struct etrax_recv_buffer *buffer;

	if (info->uses_dma_in) {

		if (!(buffer = alloc_recv_buffer(4)))

		buffer = alloc_recv_buffer(4);

		if (!buffer)

			return 0;



		buffer->length = 1;
@@ -1709,7 +1711,8 @@ static unsigned int handle_descr_data(struct e100_serial *info, 


	append_recv_buffer(info, buffer);



	if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE)))

	buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE);

	if (!buffer)

		panic("%s: Failed to allocate memory for receive buffer!\n", __func__);



	descr->buf = virt_to_phys(buffer->buffer);
@@ -1825,7 +1828,8 @@ static int start_recv_dma(struct e100_serial *info) 


	/* Set up the receiving descriptors */

	for (i = 0; i < SERIAL_RECV_DESCRIPTORS; i++) {

		if (!(buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE)))

		buffer = alloc_recv_buffer(SERIAL_DESCR_BUF_SIZE);

		if (!buffer)

			panic("%s: Failed to allocate memory for receive buffer!\n", __func__);



		descr[i].ctrl = d_int;