Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317284
b: refs/heads/master
c: 7dcc132
h: refs/heads/master
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jun 12, 2012
1 parent 13ee071 commit 5df7695
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: de443c96e5e62c5c32ae6fdfc44e12470bbf70b3
refs/heads/master: 7dcc1327d0735f6ac6ff026ff1240b4d391c52f7
4 changes: 2 additions & 2 deletions trunk/drivers/staging/bcm/nvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static INT BeceemFlashBulkRead(struct bcm_mini_adapter *Adapter,
static UINT BcmGetFlashSize(struct bcm_mini_adapter *Adapter)
{
if (IsFlash2x(Adapter))
return (Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER));
return Adapter->psFlash2xCSInfo->OffsetFromDSDStartForDSDHeader + sizeof(DSD_HEADER);
else
return 32 * 1024;
}
Expand Down Expand Up @@ -2219,7 +2219,7 @@ static ULONG BcmReadFlashRDID(struct bcm_mini_adapter *Adapter)
*/
rdmalt(Adapter, FLASH_SPI_READQ_REG, (PUINT)&ulRDID, sizeof(ulRDID));

return (ulRDID >> 8);
return ulRDID >> 8;
}

INT BcmAllocFlashCSStructure(struct bcm_mini_adapter *psAdapter)
Expand Down

0 comments on commit 5df7695

Please sign in to comment.