diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h index c36a5ef3ee5d..79d10b6fbfda 100644 --- a/drivers/staging/rtl8712/drv_types.h +++ b/drivers/staging/rtl8712/drv_types.h @@ -160,7 +160,7 @@ struct _adapter { int pid; /*process id from UI*/ struct work_struct wkFilterRxFF0; u8 blnEnableRxFF0Filter; - spinlock_t lockRxFF0Filter; + spinlock_t lock_rx_ff0_filter; const struct firmware *fw; struct usb_interface *pusb_intf; struct mutex mutex_start; diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 200a271c28e1..d0daae0b8299 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -571,7 +571,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, /* step 6. Load the firmware asynchronously */ if (rtl871x_load_fw(padapter)) goto error; - spin_lock_init(&padapter->lockRxFF0Filter); + spin_lock_init(&padapter->lock_rx_ff0_filter); mutex_init(&padapter->mutex_start); return 0; error: diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c index 223a4eba4bf4..d8307bcc63f5 100644 --- a/drivers/staging/rtl8712/xmit_linux.c +++ b/drivers/staging/rtl8712/xmit_linux.c @@ -102,9 +102,9 @@ void r8712_SetFilter(struct work_struct *work) newvalue = oldvalue & 0xfe; r8712_write8(adapter, 0x117, newvalue); - spin_lock_irqsave(&adapter->lockRxFF0Filter, irqL); + spin_lock_irqsave(&adapter->lock_rx_ff0_filter, irqL); adapter->blnEnableRxFF0Filter = 1; - spin_unlock_irqrestore(&adapter->lockRxFF0Filter, irqL); + spin_unlock_irqrestore(&adapter->lock_rx_ff0_filter, irqL); do { msleep(100); } while (adapter->blnEnableRxFF0Filter == 1);