diff options
Diffstat (limited to 'drivers/net/can/usb')
-rw-r--r-- | drivers/net/can/usb/ems_usb.c | 2 | ||||
-rw-r--r-- | drivers/net/can/usb/esd_usb2.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index e75f1a876972..a72c7bfb4090 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c | |||
@@ -386,7 +386,7 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg) | |||
386 | break; | 386 | break; |
387 | } | 387 | } |
388 | 388 | ||
389 | /* Error occured during transmission? */ | 389 | /* Error occurred during transmission? */ |
390 | if ((ecc & SJA1000_ECC_DIR) == 0) | 390 | if ((ecc & SJA1000_ECC_DIR) == 0) |
391 | cf->data[2] |= CAN_ERR_PROT_TX; | 391 | cf->data[2] |= CAN_ERR_PROT_TX; |
392 | 392 | ||
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index 05a52754f486..eb8b0e600282 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c | |||
@@ -284,7 +284,7 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, | |||
284 | break; | 284 | break; |
285 | } | 285 | } |
286 | 286 | ||
287 | /* Error occured during transmission? */ | 287 | /* Error occurred during transmission? */ |
288 | if (!(ecc & SJA1000_ECC_DIR)) | 288 | if (!(ecc & SJA1000_ECC_DIR)) |
289 | cf->data[2] |= CAN_ERR_PROT_TX; | 289 | cf->data[2] |= CAN_ERR_PROT_TX; |
290 | 290 | ||
@@ -659,7 +659,7 @@ failed: | |||
659 | static void unlink_all_urbs(struct esd_usb2 *dev) | 659 | static void unlink_all_urbs(struct esd_usb2 *dev) |
660 | { | 660 | { |
661 | struct esd_usb2_net_priv *priv; | 661 | struct esd_usb2_net_priv *priv; |
662 | int i; | 662 | int i, j; |
663 | 663 | ||
664 | usb_kill_anchored_urbs(&dev->rx_submitted); | 664 | usb_kill_anchored_urbs(&dev->rx_submitted); |
665 | for (i = 0; i < dev->net_count; i++) { | 665 | for (i = 0; i < dev->net_count; i++) { |
@@ -668,8 +668,8 @@ static void unlink_all_urbs(struct esd_usb2 *dev) | |||
668 | usb_kill_anchored_urbs(&priv->tx_submitted); | 668 | usb_kill_anchored_urbs(&priv->tx_submitted); |
669 | atomic_set(&priv->active_tx_jobs, 0); | 669 | atomic_set(&priv->active_tx_jobs, 0); |
670 | 670 | ||
671 | for (i = 0; i < MAX_TX_URBS; i++) | 671 | for (j = 0; j < MAX_TX_URBS; j++) |
672 | priv->tx_contexts[i].echo_index = MAX_TX_URBS; | 672 | priv->tx_contexts[j].echo_index = MAX_TX_URBS; |
673 | } | 673 | } |
674 | } | 674 | } |
675 | } | 675 | } |