commit a86581829fdd646655116f89cb8af2f22b5fbf9e
author Kevin McKinney <klmckinney1@gmail.com> Thu Oct 20 08:15:23 2011 -0400
committer Greg Kroah-Hartman <gregkh@suse.de> Sun Oct 23 10:16:34 2011 +0200
tree a8d5996c0217a3ba8d1b6f3c73c0e750d8307f9a
parent a5e4b81e274d7b455531a5e33ce1523caaf31a84

Staging: bcm: Fix three initialization errors in InterfaceDld.c

This patch fixes three initialization errors.
One is an incorrect initialization of a static
variable. The other two are incorrect
initializations in an if statement. These
errors were found by checkpatch.pl.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/bcm/InterfaceDld.c

diff --git a/drivers/staging/bcm/InterfaceDld.c b/drivers/staging/bcm/InterfaceDld.c
index ba83dde..bcd86bb 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -59,7 +59,7 @@
 	mm_segment_t oldfs = {0};
 	int errno = 0, len = 0, is_config_file = 0;
 	loff_t pos = 0;
-	static int fw_down = 0;
+	static int fw_down;
 	INT Status = STATUS_SUCCESS;
 	PS_INTERFACE_ADAPTER psIntfAdapter = (PS_INTERFACE_ADAPTER)arg;
 
@@ -136,9 +136,9 @@
 	B_UINT32 value = 0;
 
 	if (Adapter->pstargetparams == NULL) {
-		if ((Adapter->pstargetparams = kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL)) == NULL) {
+		Adapter->pstargetparams = kmalloc(sizeof(STARGETPARAMS), GFP_KERNEL);
+		if (Adapter->pstargetparams == NULL)
 			return -ENOMEM;
-		}
 	}
 
 	if (psFwInfo->u32FirmwareLength != sizeof(STARGETPARAMS))
@@ -317,7 +317,8 @@
 			break;
 		}
 
-		if (STATUS_SUCCESS != (retval = bcm_compare_buff_contents(readbackbuff, mappedbuffer, len)))
+		retval = bcm_compare_buff_contents(readbackbuff, mappedbuffer, len);
+		if (STATUS_SUCCESS != retval)
 			break;
 
 		u32StartingAddress += len;