Merge branches 'fixes', 'pgt-next' and 'versatile' into devel

[pandora-kernel.git] / drivers / net / can / usb / esd_usb2.c

diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c
index 05a5275..dc53c83 100644 (file)
--- a/drivers/net/can/usb/esd_usb2.c
+++ b/drivers/net/can/usb/esd_usb2.c
@@ -659,7 +659,7 @@ failed:
 static void unlink_all_urbs(struct esd_usb2 *dev)
 {
        struct esd_usb2_net_priv *priv;
-       int i;
+       int i, j;
 
        usb_kill_anchored_urbs(&dev->rx_submitted);
        for (i = 0; i < dev->net_count; i++) {
@@ -668,8 +668,8 @@ static void unlink_all_urbs(struct esd_usb2 *dev)
                        usb_kill_anchored_urbs(&priv->tx_submitted);
                        atomic_set(&priv->active_tx_jobs, 0);
 
-                       for (i = 0; i < MAX_TX_URBS; i++)
-                               priv->tx_contexts[i].echo_index = MAX_TX_URBS;
+                       for (j = 0; j < MAX_TX_URBS; j++)
+                               priv->tx_contexts[j].echo_index = MAX_TX_URBS;
                }
        }
 }