6 files changed, 25 insertions, 11 deletions

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index a13a4896a8bd..0626dcfd1f3d 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -184,12 +184,12 @@
  * Below is some version info we got:
  *    SOC   Version   IP-Version  Glitch- [TR]WRN_INT IRQ Err Memory err RTR re-
  *                                Filter? connected?  Passive detection  ception in MB
- *   MX25  FlexCAN2  03.00.00.00     no        no         ?       no        no
+ *   MX25  FlexCAN2  03.00.00.00     no        no        no       no        no
  *   MX28  FlexCAN2  03.00.04.00    yes       yes        no       no        no
- *   MX35  FlexCAN2  03.00.00.00     no        no         ?       no        no
+ *   MX35  FlexCAN2  03.00.00.00     no        no        no       no        no
  *   MX53  FlexCAN2  03.00.00.00    yes        no        no       no        no
  *   MX6s  FlexCAN3  10.00.12.00    yes       yes        no       no       yes
- *   VF610 FlexCAN3  ?               no       yes         ?      yes       yes?
+ *   VF610 FlexCAN3  ?               no       yes        no      yes       yes?
  *
  * Some SOCs do not have the RX_WARN & TX_WARN interrupt line connected.
  */
@@ -297,7 +297,8 @@ static const struct flexcan_devtype_data fsl_imx6q_devtype_data = {
 
 static const struct flexcan_devtype_data fsl_vf610_devtype_data = {
         .quirks = FLEXCAN_QUIRK_DISABLE_RXFG | FLEXCAN_QUIRK_ENABLE_EACEN_RRS |
-                FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP,
+                FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_OFF_TIMESTAMP |
+                FLEXCAN_QUIRK_BROKEN_PERR_STATE,
 };
 
 static const struct can_bittiming_const flexcan_bittiming_const = {
diff --git a/drivers/net/can/peak_canfd/peak_pciefd_main.c b/drivers/net/can/peak_canfd/peak_pciefd_main.c
index b4efd711f824..788c3464a3b0 100644
--- a/drivers/net/can/peak_canfd/peak_pciefd_main.c
+++ b/drivers/net/can/peak_canfd/peak_pciefd_main.c
@@ -825,7 +825,10 @@ err_release_regions:
 err_disable_pci:
         pci_disable_device(pdev);
 
-        return err;
+        /* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while
+         * the probe() function must return a negative errno in case of failure
+         * (err is unchanged if negative) */
+        return pcibios_err_to_errno(err);
 }
 
 /* free the board structure object, as well as its resources: */
diff --git a/drivers/net/can/sja1000/peak_pci.c b/drivers/net/can/sja1000/peak_pci.c
index 131026fbc2d7..5adc95c922ee 100644
--- a/drivers/net/can/sja1000/peak_pci.c
+++ b/drivers/net/can/sja1000/peak_pci.c
@@ -717,7 +717,10 @@ failure_release_regions:
 failure_disable_pci:
         pci_disable_device(pdev);
 
-        return err;
+        /* pci_xxx_config_word() return positive PCIBIOS_xxx error codes while
+         * the probe() function must return a negative errno in case of failure
+         * (err is unchanged if negative) */
+        return pcibios_err_to_errno(err);
 }
 
 static void peak_pci_remove(struct pci_dev *pdev)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 4d4941469cfc..db6ea936dc3f 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -637,6 +637,9 @@ static int ti_hecc_rx_poll(struct napi_struct *napi, int quota)
                 mbx_mask = hecc_read(priv, HECC_CANMIM);
                 mbx_mask |= HECC_TX_MBOX_MASK;
                 hecc_write(priv, HECC_CANMIM, mbx_mask);
+        } else {
+                /* repoll is done only if whole budget is used */
+                num_pkts = quota;
         }
 
         return num_pkts;
diff --git a/drivers/net/can/usb/kvaser_usb.c b/drivers/net/can/usb/kvaser_usb.c
index 9b18d96ef526..f95945915d20 100644
--- a/drivers/net/can/usb/kvaser_usb.c
+++ b/drivers/net/can/usb/kvaser_usb.c
@@ -609,8 +609,8 @@ static int kvaser_usb_wait_msg(const struct kvaser_usb *dev, u8 id,
                         }
 
                         if (pos + tmp->len > actual_len) {
-                                dev_err(dev->udev->dev.parent,
-                                        "Format error\n");
+                                dev_err_ratelimited(dev->udev->dev.parent,
+                                                    "Format error\n");
                                 break;
                         }
 
@@ -813,6 +813,7 @@ static int kvaser_usb_simple_msg_async(struct kvaser_usb_net_priv *priv,
         if (err) {
                 netdev_err(netdev, "Error transmitting URB\n");
                 usb_unanchor_urb(urb);
+                kfree(buf);
                 usb_free_urb(urb);
                 return err;
         }
@@ -1333,7 +1334,7 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb)
                 goto resubmit_urb;
         }
 
-        while (pos <= urb->actual_length - MSG_HEADER_LEN) {
+        while (pos <= (int)(urb->actual_length - MSG_HEADER_LEN)) {
                 msg = urb->transfer_buffer + pos;
 
                 /* The Kvaser firmware can only read and write messages that
@@ -1352,7 +1353,8 @@ static void kvaser_usb_read_bulk_callback(struct urb *urb)
                 }
 
                 if (pos + msg->len > urb->actual_length) {
-                        dev_err(dev->udev->dev.parent, "Format error\n");
+                        dev_err_ratelimited(dev->udev->dev.parent,
+                                            "Format error\n");
                         break;
                 }
 
@@ -1768,6 +1770,7 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,
                 spin_unlock_irqrestore(&priv->tx_contexts_lock, flags);
 
                 usb_unanchor_urb(urb);
+                kfree(buf);
 
                 stats->tx_dropped++;
 
diff --git a/drivers/net/can/usb/mcba_usb.c b/drivers/net/can/usb/mcba_usb.c
index 7f0272558bef..ef417dcddbf7 100644
--- a/drivers/net/can/usb/mcba_usb.c
+++ b/drivers/net/can/usb/mcba_usb.c
@@ -592,6 +592,7 @@ static void mcba_usb_read_bulk_callback(struct urb *urb)
                 break;
 
         case -ENOENT:
+        case -EPIPE:
         case -ESHUTDOWN:
                 return;
 
@@ -862,7 +863,7 @@ static int mcba_usb_probe(struct usb_interface *intf,
                 goto cleanup_unregister_candev;
         }
 
-        dev_info(&intf->dev, "Microchip CAN BUS analizer connected\n");
+        dev_info(&intf->dev, "Microchip CAN BUS Analyzer connected\n");
 
         return 0;