This patch fixes one white space issue and two
initialization errors in file, InterfaceDld.c,
found by checkpatch.pl.

Signed-off-by: Kevin McKinney <[email protected]>
---
 drivers/staging/bcm/InterfaceDld.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/bcm/InterfaceDld.c 
b/drivers/staging/bcm/InterfaceDld.c
index 6f58fb5..7ac52ad 100644
--- a/drivers/staging/bcm/InterfaceDld.c
+++ b/drivers/staging/bcm/InterfaceDld.c
@@ -38,17 +38,18 @@ int InterfaceFileDownload(PVOID arg, struct file *flp, 
unsigned int on_chip_loc)
        return errno;
 }
 
-int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp,         
unsigned int on_chip_loc)
+int InterfaceFileReadbackFromChip(PVOID arg, struct file *flp, unsigned int 
on_chip_loc)
 {
        char *buff, *buff_readback;
        unsigned int reg = 0;
        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;
 
+       fw_down = 0;
        buff = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB, GFP_DMA);
        buff_readback = kmalloc(MAX_TRANSFER_CTRL_BYTE_USB , GFP_DMA);
        if (!buff || !buff_readback) {
@@ -120,7 +121,8 @@ 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;
        }
 
@@ -302,7 +304,8 @@ static INT buffRdbkVerify(PMINI_ADAPTER Adapter,
                        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;
-- 
1.7.4.1

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to