summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/vt6656/device.h2
-rw-r--r--drivers/staging/vt6656/int.c2
-rw-r--r--drivers/staging/vt6656/main_usb.c4
-rw-r--r--drivers/staging/vt6656/rxtx.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index a5a6c3949ea4..757d500deef1 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -292,7 +292,7 @@ struct vnt_private {
u32 cbRD;
/* Variables to track resources for the BULK Out Pipe */
- struct vnt_usb_send_context *apTD[CB_MAX_TX_DESC];
+ struct vnt_usb_send_context *tx_context[CB_MAX_TX_DESC];
u32 cbTD;
/* Variables to track resources for the Interrupt In Pipe */
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index 87ac6a17f75c..e404d9e6a0e7 100644
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -78,7 +78,7 @@ static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr)
if (pkt_no >= priv->cbTD)
return -EINVAL;
- context = priv->apTD[pkt_no];
+ context = priv->tx_context[pkt_no];
if (!context->skb)
return -EINVAL;
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 5c8ff9871535..ff4e18d2e8f7 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -399,7 +399,7 @@ static void device_free_tx_bufs(struct vnt_private *priv)
int ii;
for (ii = 0; ii < priv->cbTD; ii++) {
- tx_context = priv->apTD[ii];
+ tx_context = priv->tx_context[ii];
/* deallocate URBs */
if (tx_context->urb) {
usb_kill_urb(tx_context->urb);
@@ -471,7 +471,7 @@ static bool device_alloc_bufs(struct vnt_private *priv)
goto free_tx;
}
- priv->apTD[ii] = tx_context;
+ priv->tx_context[ii] = tx_context;
tx_context->priv = priv;
tx_context->pkt_no = ii;
diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index 76b7f173f4fa..f3bbfba1b138 100644
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -82,10 +82,10 @@ static struct vnt_usb_send_context
dev_dbg(&priv->usb->dev, "%s\n", __func__);
for (ii = 0; ii < priv->cbTD; ii++) {
- if (!priv->apTD[ii])
+ if (!priv->tx_context[ii])
return NULL;
- context = priv->apTD[ii];
+ context = priv->tx_context[ii];
if (context->in_use == false) {
context->in_use = true;
memset(context->data, 0,