From: Kevin McKinney <klmckinney1@gmail.com>
Date: Fri, 8 Jun 2012 03:52:42 +0000 (-0400)
Subject: Staging: bcm: Return -ENOMEM instead of -1 when memory not acquired in nmv.c
X-Git-Tag: next-20120724~21^2~842
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7dd80eb925a5aac4ebe8b1abec20802e91f60c2e;p=karo-tx-linux.git

Staging: bcm: Return -ENOMEM instead of -1 when memory not acquired in nmv.c

This patch changes the return statement on two
conditions where memory could not be acquired.
It returns -ENOMEM instead of -1.

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

diff --git a/drivers/staging/bcm/nvm.c b/drivers/staging/bcm/nvm.c
index c8a0a9096a0e..ed2316570d30 100644
--- a/drivers/staging/bcm/nvm.c
+++ b/drivers/staging/bcm/nvm.c
@@ -1378,7 +1378,7 @@ INT PropagateCalParamsFromEEPROMToMemory(struct bcm_mini_adapter *Adapter)
 	INT Status = 0;
 
 	if (pBuff == NULL)
-		return -1;
+		return -ENOMEM;
 
 	if (0 != BeceemEEPROMBulkRead(Adapter, &uiEepromSize, EEPROM_SIZE_OFFSET, 4)) {
 		kfree(pBuff);
@@ -1462,7 +1462,7 @@ INT PropagateCalParamsFromFlashToMemory(struct bcm_mini_adapter *Adapter)
 
 	pBuff = kmalloc(uiEepromSize, GFP_KERNEL);
 	if (pBuff == NULL)
-		return -1;
+		return -ENOMEM;
 
 	if (0 != BeceemNVMRead(Adapter, (PUINT)pBuff, uiCalStartAddr, uiEepromSize)) {
 		kfree(pBuff);