diff options
| author | Kevin McKinney <klmckinney1@gmail.com> | 2011-10-20 12:15:23 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-23 08:16:34 (GMT) |
| commit | a86581829fdd646655116f89cb8af2f22b5fbf9e (patch) | |
| tree | a8d5996c0217a3ba8d1b6f3c73c0e750d8307f9a | |
| parent | a5e4b81e274d7b455531a5e33ce1523caaf31a84 (diff) | |
| download | linux-fsl-qoriq-a86581829fdd646655116f89cb8af2f22b5fbf9e.tar.xz | |
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>
| -rw-r--r-- | drivers/staging/bcm/InterfaceDld.c | 9 |
1 files changed, 5 insertions, 4 deletions
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 @@ int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int on_c 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 @@ static int bcm_download_config_file(PMINI_ADAPTER Adapter, FIRMWARE_INFO *psFwIn 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 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter, PUCHAR mappedbuffer, UINT u32Fi 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; |