Staging: bcm: signedness bug in StoreSFParam()
authorDan Carpenter <error27@gmail.com>
Sat, 13 Nov 2010 04:37:49 +0000 (07:37 +0300)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Nov 2010 20:31:50 +0000 (12:31 -0800)
wrm() returns negative error codes so "ret" needs to be signed here.
There was place where wrm() returned positive EACCES instead of
negative -EACCES so I fixed that as well.  Also a few checkpatch.pl
issues.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/bcm/CmHost.c
drivers/staging/bcm/InterfaceMisc.c

index a685cad..5ac4582 100644 (file)
@@ -1649,17 +1649,17 @@ static inline ULONG RestoreSFParam(PMINI_ADAPTER Adapter, ULONG ulAddrSFParamSet
 static ULONG StoreSFParam(PMINI_ADAPTER Adapter,PUCHAR pucSrcBuffer,ULONG  ulAddrSFParamSet)
 {
     UINT       nBytesToWrite = sizeof(stServiceFlowParamSI);
-       UINT    uiRetVal =0;
+       int ret = 0;
 
        if(ulAddrSFParamSet == 0 || NULL == pucSrcBuffer)
        {
                return 0;
        }
 
-       uiRetVal = wrm(Adapter,ulAddrSFParamSet,(PUCHAR)pucSrcBuffer, nBytesToWrite);
-       if(uiRetVal < 0) {
+       ret = wrm(Adapter, ulAddrSFParamSet, (u8 *)pucSrcBuffer, nBytesToWrite);
+       if (ret < 0) {
                BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL,  "%s:%d WRM failed",__FUNCTION__, __LINE__);
-               return uiRetVal;
+               return ret;
        }
        return 1;
 }
index b7d6e7a..a51185b 100644 (file)
@@ -90,7 +90,7 @@ InterfaceWRM(PS_INTERFACE_ADAPTER psIntfAdapter,
        if((psIntfAdapter->psAdapter->StopAllXaction == TRUE) && (psIntfAdapter->psAdapter->chip_id >= T3LPB))
        {
                BCM_DEBUG_PRINT(psIntfAdapter->psAdapter,DBG_TYPE_OTHERS, WRM, DBG_LVL_ALL,"Currently Xaction is not allowed on the bus...");
-               return EACCES;
+               return -EACCES;
        }
 
        if(psIntfAdapter->bSuspended ==TRUE || psIntfAdapter->bPreparingForBusSuspend == TRUE)