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

Commit ca45e700 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

Staging: bcm: Remove assignment from if conditions reported by checkpatch.pl 



This patch removes an assignment from three if
conditions.  In all three cases, the line of code was
attempting to allocate memory, and check
if the memory was allocated in the if statement.
This issue was reported by checkpatch.pl.

Signed-off-by: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f969f84e

drivers/staging/bcm/InterfaceInit.c

+10 −6
Original line number Diff line number Diff line
@@ -280,8 +280,9 @@ static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter) 
	int i = 0;



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

		if ((psIntfAdapter->asUsbTcb[i].urb =

				usb_alloc_urb(0, GFP_KERNEL)) == NULL) {

		psIntfAdapter->asUsbTcb[i].urb = usb_alloc_urb(0, GFP_KERNEL);



		if (psIntfAdapter->asUsbTcb[i].urb == NULL) {

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,

				"Can't allocate Tx urb for index %d\n", i);

			return -ENOMEM;
@@ -289,14 +290,17 @@ static int AllocUsbCb(PS_INTERFACE_ADAPTER psIntfAdapter) 
	}



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

		if ((psIntfAdapter->asUsbRcb[i].urb =

				usb_alloc_urb(0, GFP_KERNEL)) == NULL) {

		psIntfAdapter->asUsbRcb[i].urb = usb_alloc_urb(0, GFP_KERNEL);



		if (psIntfAdapter->asUsbRcb[i].urb == NULL) {

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,

				"Can't allocate Rx urb for index %d\n", i);

			return -ENOMEM;

		}

		if ((psIntfAdapter->asUsbRcb[i].urb->transfer_buffer =

			kmalloc(MAX_DATA_BUFFER_SIZE, GFP_KERNEL)) == NULL) {



		psIntfAdapter->asUsbRcb[i].urb->transfer_buffer = kmalloc(MAX_DATA_BUFFER_SIZE, GFP_KERNEL);



		if (psIntfAdapter->asUsbRcb[i].urb->transfer_buffer == NULL) {

			BCM_DEBUG_PRINT(psIntfAdapter->psAdapter, DBG_TYPE_PRINTK, 0, 0,

				"Can't allocate Rx buffer for index %d\n", i);

			return -ENOMEM;