Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fe526e1 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

staging: bcm: clean up a type issue in ConfigureEndPointTypesThroughEEPROM() 



We only ever set the highest 4 bytes of ulReg.  This would cause a
problem on big endian systems.  The type should be u32 instead of
unsigned long.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4f4112b2

drivers/staging/bcm/InterfaceInit.c

+5 −5
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void InterfaceAdapterFree(struct bcm_interface_adapter *psIntfAdapter) 


static void ConfigureEndPointTypesThroughEEPROM(struct bcm_mini_adapter *Adapter)

{

	unsigned long ulReg = 0;

	u32 ulReg;

	int bytes;



	/* Program EP2 MAX_PKT_SIZE */
@@ -96,7 +96,7 @@ static void ConfigureEndPointTypesThroughEEPROM(struct bcm_mini_adapter *Adapter 
	BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x140, 4, TRUE);



	/* Program TX EP as interrupt(Alternate Setting) */

	bytes = rdmalt(Adapter, 0x0F0110F8, (u32 *)&ulReg, sizeof(u32));

	bytes = rdmalt(Adapter, 0x0F0110F8, &ulReg, sizeof(u32));

	if (bytes < 0) {

		BCM_DEBUG_PRINT(Adapter, DBG_TYPE_INITEXIT, DRV_ENTRY, DBG_LVL_ALL,

			"reading of Tx EP failed\n");
@@ -119,18 +119,18 @@ static void ConfigureEndPointTypesThroughEEPROM(struct bcm_mini_adapter *Adapter 
	 * Update EEPROM Version.

	 * Read 4 bytes from 508 and modify 511 and 510.

	 */

	ReadBeceemEEPROM(Adapter, 0x1FC, (PUINT)&ulReg);

	ReadBeceemEEPROM(Adapter, 0x1FC, &ulReg);

	ulReg &= 0x0101FFFF;

	BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x1FC, 4, TRUE);



	/* Update length field if required. Also make the string NULL terminated. */



	ReadBeceemEEPROM(Adapter, 0xA8, (PUINT)&ulReg);

	ReadBeceemEEPROM(Adapter, 0xA8, &ulReg);

	if ((ulReg&0x00FF0000)>>16 > 0x30) {

		ulReg = (ulReg&0xFF00FFFF)|(0x30<<16);

		BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0xA8, 4, TRUE);

	}

	ReadBeceemEEPROM(Adapter, 0x148, (PUINT)&ulReg);

	ReadBeceemEEPROM(Adapter, 0x148, &ulReg);

	if ((ulReg&0x00FF0000)>>16 > 0x30) {

		ulReg = (ulReg&0xFF00FFFF)|(0x30<<16);

		BeceemEEPROMBulkWrite(Adapter, (PUCHAR)&ulReg, 0x148, 4, TRUE);