Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 12 insertions, 14 deletions

diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c
index 575790e8a75a..74a7dfecee27 100644
--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -843,7 +843,7 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)
                 if (clear_intf)
                         mcp251x_write_bits(spi, CANINTF, clear_intf, 0x00);
 
-                if (eflag)
+                if (eflag & (EFLG_RX0OVR | EFLG_RX1OVR))
                         mcp251x_write_bits(spi, EFLG, eflag, 0x00);
 
                 /* Update can state */
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c
index 5eee62badf45..cbc99d5649af 100644
--- a/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@ -826,9 +826,8 @@ static struct gs_can *gs_make_candev(unsigned int channel, struct usb_interface
 static void gs_destroy_candev(struct gs_can *dev)
 {
         unregister_candev(dev->netdev);
-        free_candev(dev->netdev);
         usb_kill_anchored_urbs(&dev->tx_submitted);
-        kfree(dev);
+        free_candev(dev->netdev);
 }
 
 static int gs_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
@@ -913,12 +912,15 @@ static int gs_usb_probe(struct usb_interface *intf, const struct usb_device_id *
         for (i = 0; i < icount; i++) {
                 dev->canch[i] = gs_make_candev(i, intf);
                 if (IS_ERR_OR_NULL(dev->canch[i])) {
+                        /* save error code to return later */
+                        rc = PTR_ERR(dev->canch[i]);
+
                         /* on failure destroy previously created candevs */
                         icount = i;
-                        for (i = 0; i < icount; i++) {
+                        for (i = 0; i < icount; i++)
                                 gs_destroy_candev(dev->canch[i]);
-                                dev->canch[i] = NULL;
-                        }
+
+                        usb_kill_anchored_urbs(&dev->rx_submitted);
                         kfree(dev);
                         return rc;
                 }
@@ -939,16 +941,12 @@ static void gs_usb_disconnect(struct usb_interface *intf)
                 return;
         }
 
-        for (i = 0; i < GS_MAX_INTF; i++) {
-                struct gs_can *can = dev->canch[i];
-
-                if (!can)
-                        continue;
-
-                gs_destroy_candev(can);
-        }
+        for (i = 0; i < GS_MAX_INTF; i++)
+                if (dev->canch[i])
+                        gs_destroy_candev(dev->canch[i]);
 
         usb_kill_anchored_urbs(&dev->rx_submitted);
+        kfree(dev);
 }
 
 static const struct usb_device_id gs_usb_table[] = {