diff options
Diffstat (limited to 'drivers/staging/rtl8712/usb_ops_linux.c')
| -rw-r--r-- | drivers/staging/rtl8712/usb_ops_linux.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c index ee5968808332..9d290bc2fdb7 100644 --- a/drivers/staging/rtl8712/usb_ops_linux.c +++ b/drivers/staging/rtl8712/usb_ops_linux.c @@ -147,9 +147,9 @@ static void usb_write_mem_complete(struct urb *purb) if (purb->status != 0) { if (purb->status == (-ESHUTDOWN)) - padapter->bDriverStopped = true; + padapter->driver_stopped = true; else - padapter->bSurpriseRemoved = true; + padapter->surprise_removed = true; } complete(&pintfpriv->io_retevt_comp); } @@ -164,7 +164,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) struct usb_device *pusbd = pdvobj->pusbdev; struct urb *piorw_urb = pintfpriv->piorw_urb; - if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) || + if ((padapter->driver_stopped) || (padapter->surprise_removed) || (padapter->pwrctrlpriv.pnp_bstop_trx)) return; /* translate DMA FIFO addr to pipehandle */ @@ -186,7 +186,7 @@ static void r8712_usb_read_port_complete(struct urb *purb) struct _adapter *padapter = (struct _adapter *)precvbuf->adapter; struct recv_priv *precvpriv = &padapter->recvpriv; - if (padapter->bSurpriseRemoved || padapter->bDriverStopped) + if (padapter->surprise_removed || padapter->driver_stopped) return; if (purb->status == 0) { /* SUCCESS */ if ((purb->actual_length > (MAX_RECVBUF_SZ)) || @@ -218,11 +218,11 @@ static void r8712_usb_read_port_complete(struct urb *purb) case -EPIPE: case -ENODEV: case -ESHUTDOWN: - padapter->bDriverStopped = true; + padapter->driver_stopped = true; break; case -ENOENT: - if (!padapter->bSuspended) { - padapter->bDriverStopped = true; + if (!padapter->suspended) { + padapter->driver_stopped = true; break; } /* Fall through. */ @@ -254,7 +254,7 @@ u32 r8712_usb_read_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *rmem) struct recv_priv *precvpriv = &adapter->recvpriv; struct usb_device *pusbd = pdvobj->pusbdev; - if (adapter->bDriverStopped || adapter->bSurpriseRemoved || + if (adapter->driver_stopped || adapter->surprise_removed || adapter->pwrctrlpriv.pnp_bstop_trx || !precvbuf) return _FAIL; r8712_init_recvbuf(adapter, precvbuf); @@ -314,9 +314,9 @@ void r8712_xmit_bh(void *priv) struct _adapter *padapter = priv; struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - if (padapter->bDriverStopped || - padapter->bSurpriseRemoved) { - netdev_err(padapter->pnetdev, "xmit_bh => bDriverStopped or bSurpriseRemoved\n"); + if (padapter->driver_stopped || + padapter->surprise_removed) { + netdev_err(padapter->pnetdev, "xmit_bh => driver_stopped or surprise_removed\n"); return; } ret = r8712_xmitframe_complete(padapter, pxmitpriv, NULL); @@ -360,7 +360,7 @@ static void usb_write_port_complete(struct urb *purb) break; } } - if (padapter->bSurpriseRemoved) + if (padapter->surprise_removed) return; switch (purb->status) { case 0: @@ -390,7 +390,7 @@ u32 r8712_usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem) struct usb_device *pusbd = pdvobj->pusbdev; struct pkt_attrib *pattrib = &pxmitframe->attrib; - if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) || + if ((padapter->driver_stopped) || (padapter->surprise_removed) || (padapter->pwrctrlpriv.pnp_bstop_trx)) return _FAIL; for (i = 0; i < 8; i++) { |