Renamed variable "IoBuffer" -> "io_buff" in bcm_char_ioctl_reg_write_private(). Signed-off-by: Matthias Beyer <mail@xxxxxxxxxxxxxxxx> --- drivers/staging/bcm/Bcmchar.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 4127e5b..5c6ae99 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -345,7 +345,7 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, struct bcm_mini_adapter *ad) { struct bcm_rdm_buffer rdm_buff = {0}; - struct bcm_ioctl_buffer IoBuffer; + struct bcm_ioctl_buffer io_buff; PCHAR temp_buff = NULL; UINT uiTempVar = 0; INT Status; @@ -361,22 +361,22 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, } /* Copy Ioctl Buffer structure */ - if (copy_from_user(&IoBuffer, argp, sizeof(struct bcm_ioctl_buffer))) + if (copy_from_user(&io_buff, argp, sizeof(struct bcm_ioctl_buffer))) return -EFAULT; - if (IoBuffer.InputLength > sizeof(rdm_buff)) + if (io_buff.InputLength > sizeof(rdm_buff)) return -EINVAL; - if (copy_from_user(&rdm_buff, IoBuffer.InputBuffer, - IoBuffer.InputLength)) + if (copy_from_user(&rdm_buff, io_buff.InputBuffer, + io_buff.InputLength)) return -EFAULT; - if (IoBuffer.OutputLength > USHRT_MAX || - IoBuffer.OutputLength == 0) { + if (io_buff.OutputLength > USHRT_MAX || + io_buff.OutputLength == 0) { return -EINVAL; } - temp_buff = kmalloc(IoBuffer.OutputLength, GFP_KERNEL); + temp_buff = kmalloc(io_buff.OutputLength, GFP_KERNEL); if (!temp_buff) return STATUS_FAILURE; @@ -393,11 +393,11 @@ static int bcm_char_ioctl_eeprom_reg_read(void __user *argp, uiTempVar = rdm_buff.Register & EEPROM_REJECT_MASK; bytes = rdmaltWithLock(ad, (UINT)rdm_buff.Register, - (PUINT)temp_buff, IoBuffer.OutputLength); + (PUINT)temp_buff, io_buff.OutputLength); if (bytes > 0) { Status = STATUS_SUCCESS; - if (copy_to_user(IoBuffer.OutputBuffer, temp_buff, bytes)) { + if (copy_to_user(io_buff.OutputBuffer, temp_buff, bytes)) { kfree(temp_buff); return -EFAULT; } -- 2.0.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel