UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: bcm: Bcmchar.c: Renamed variable: "psFwInfo" -> "fw_info" 

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Matthias Beyer 2014-08-27 12:57:47 +02:00 committed by Greg Kroah-Hartman
parent ea3d010d3b
commit 3f262b21da
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/bcm/Bcmchar.c
View File

@ -964,7 +964,7 @@ static int bcm_char_ioctl_buffer_download_start(
static int bcm_char_ioctl_buffer_download(void __user *argp, static int bcm_char_ioctl_buffer_download(void __user *argp,
struct bcm_mini_adapter *ad) struct bcm_mini_adapter *ad)
{ {
struct bcm_firmware_info *psFwInfo = NULL; struct bcm_firmware_info *fw_info = NULL;
struct bcm_ioctl_buffer io_buff; struct bcm_ioctl_buffer io_buff;
INT status; INT status;
@ -992,35 +992,35 @@ static int bcm_char_ioctl_buffer_download(void __user *argp,
return -EINVAL; return -EINVAL;
} }
psFwInfo = kmalloc(sizeof(*psFwInfo), GFP_KERNEL); fw_info = kmalloc(sizeof(*fw_info), GFP_KERNEL);
if (!psFwInfo) { if (!fw_info) {
up(&ad->fw_download_sema); up(&ad->fw_download_sema);
return -ENOMEM; return -ENOMEM;
} }
if (copy_from_user(psFwInfo, io_buff.InputBuffer, if (copy_from_user(fw_info, io_buff.InputBuffer,
io_buff.InputLength)) { io_buff.InputLength)) {
up(&ad->fw_download_sema); up(&ad->fw_download_sema);
kfree(psFwInfo); kfree(fw_info);
return -EFAULT; return -EFAULT;
} }
if (!psFwInfo->pvMappedFirmwareAddress || if (!fw_info->pvMappedFirmwareAddress ||
(psFwInfo->u32FirmwareLength == 0)) { (fw_info->u32FirmwareLength == 0)) {
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"Something else is wrong %lu\n", "Something else is wrong %lu\n",
psFwInfo->u32FirmwareLength); fw_info->u32FirmwareLength);
up(&ad->fw_download_sema); up(&ad->fw_download_sema);
kfree(psFwInfo); kfree(fw_info);
status = -EINVAL; status = -EINVAL;
return status; return status;
} }
status = bcm_ioctl_fw_download(ad, psFwInfo); status = bcm_ioctl_fw_download(ad, fw_info);
if (status != STATUS_SUCCESS) { if (status != STATUS_SUCCESS) {
if (psFwInfo->u32StartingAddress == CONFIG_BEGIN_ADDR) if (fw_info->u32StartingAddress == CONFIG_BEGIN_ADDR)
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0, BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, 0, 0,
"IOCTL: Configuration File Upload Failed\n"); "IOCTL: Configuration File Upload Failed\n");
else else
@ -1042,7 +1042,7 @@ static int bcm_char_ioctl_buffer_download(void __user *argp,
BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL, BCM_DEBUG_PRINT(ad, DBG_TYPE_PRINTK, OSAL_DBG, DBG_LVL_ALL,
"IOCTL: Firmware File Uploaded\n"); "IOCTL: Firmware File Uploaded\n");
kfree(psFwInfo); kfree(fw_info);
return status; return status;
} }