Commit 7dd80eb9 authored by Kevin McKinney's avatar Kevin McKinney Committed by Greg Kroah-Hartman
Browse files

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: default avatarKevin McKinney <klmckinney1@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6788d7da

drivers/staging/bcm/nvm.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1378,7 +1378,7 @@ INT PropagateCalParamsFromEEPROMToMemory(struct bcm_mini_adapter *Adapter) 
	INT Status = 0;

	INT Status = 0;





	if (pBuff == NULL)

	if (pBuff == NULL)

		return -1;

		return -ENOMEM;





	if (0 != BeceemEEPROMBulkRead(Adapter, &uiEepromSize, EEPROM_SIZE_OFFSET, 4)) {

	if (0 != BeceemEEPROMBulkRead(Adapter, &uiEepromSize, EEPROM_SIZE_OFFSET, 4)) {

		kfree(pBuff);

		kfree(pBuff);
@@ -1462,7 +1462,7 @@ INT PropagateCalParamsFromFlashToMemory(struct bcm_mini_adapter *Adapter) 




	pBuff = kmalloc(uiEepromSize, GFP_KERNEL);

	pBuff = kmalloc(uiEepromSize, GFP_KERNEL);

	if (pBuff == NULL)

	if (pBuff == NULL)

		return -1;

		return -ENOMEM;





	if (0 != BeceemNVMRead(Adapter, (PUINT)pBuff, uiCalStartAddr, uiEepromSize)) {

	if (0 != BeceemNVMRead(Adapter, (PUINT)pBuff, uiCalStartAddr, uiEepromSize)) {

		kfree(pBuff);

		kfree(pBuff);