diff options
Diffstat (limited to 'drivers/staging/rtl8712/usb_intf.c')
-rw-r--r-- | drivers/staging/rtl8712/usb_intf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 005010de9997..7478bbd3de78 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -196,7 +196,7 @@ static int r871x_suspend(struct usb_interface *pusb_intf, pm_message_t state) struct _adapter *padapter = netdev_priv(pnetdev); netdev_info(pnetdev, "Suspending...\n"); - padapter->bSuspended = true; + padapter->suspended = true; rtl871x_intf_stop(padapter); if (pnetdev->netdev_ops->ndo_stop) pnetdev->netdev_ops->ndo_stop(pnetdev); @@ -220,7 +220,7 @@ static int r871x_resume(struct usb_interface *pusb_intf) netif_device_attach(pnetdev); if (pnetdev->netdev_ops->ndo_open) pnetdev->netdev_ops->ndo_open(pnetdev); - padapter->bSuspended = false; + padapter->suspended = false; rtl871x_intf_resume(padapter); return 0; } @@ -271,7 +271,7 @@ static void r8712_usb_dvobj_deinit(struct _adapter *padapter) void rtl871x_intf_stop(struct _adapter *padapter) { /*disable_hw_interrupt*/ - if (!padapter->bSurpriseRemoved) { + if (!padapter->surprise_removed) { /*device still exists, so driver can do i/o operation * TODO: */ @@ -289,7 +289,7 @@ void r871x_dev_unload(struct _adapter *padapter) { if (padapter->bup) { /*s1.*/ - padapter->bDriverStopped = true; + padapter->driver_stopped = true; /*s3.*/ rtl871x_intf_stop(padapter); @@ -298,7 +298,7 @@ void r871x_dev_unload(struct _adapter *padapter) r8712_stop_drv_threads(padapter); /*s5.*/ - if (!padapter->bSurpriseRemoved) { + if (!padapter->surprise_removed) { padapter->hw_init_completed = false; rtl8712_hal_deinit(padapter); } @@ -600,7 +600,7 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf) /* never exit with a firmware callback pending */ wait_for_completion(&padapter->rtl8712_fw_ready); if (drvpriv.drv_registered) - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true; unregister_netdev(pnetdev); /* will call netdev_close() */ flush_scheduled_work(); udelay(1); |