summaryrefslogtreecommitdiff
path: root/drivers/staging/bcm
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2014-08-27 12:57:48 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-08-30 13:01:37 -0700
commit7029fbb7611ca150f3d377dad9a47c4f94a307a6 (patch)
treebad4c2b9942ae17913c8a8b7d10c53485338bde0 /drivers/staging/bcm
parent3f262b21dab0834ca09979fb404922c5f561eeed (diff)
Staging: bcm: Bcmchar.c: Renamed variable: "NVMAccess" -> "nvm_access"
Signed-off-by: Matthias Beyer <mail@beyermatthias.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r--drivers/staging/bcm/Bcmchar.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c
index 810e174bcb2e..dea2cce3abae 100644
--- a/drivers/staging/bcm/Bcmchar.c
+++ b/drivers/staging/bcm/Bcmchar.c
@@ -1121,10 +1121,10 @@ static int bcm_char_ioctl_buffer_download_stop(void __user *argp,
static int bcm_char_ioctl_chip_reset(struct bcm_mini_adapter *ad)
{
INT status;
- INT NVMAccess;
+ INT nvm_access;
- NVMAccess = down_trylock(&ad->NVMRdmWrmLock);
- if (NVMAccess) {
+ nvm_access = down_trylock(&ad->NVMRdmWrmLock);
+ if (nvm_access) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
" IOCTL_BCM_CHIP_RESET not allowed as EEPROM Read/Write is in progress\n");
return -EACCES;