Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/nes: Add support for new SFP+ PHY
  RDMA/nes: Add wide_ppm_offset parm for switch compatibility
  RDMA/nes: Fix SFP+ PHY initialization
  RDMA/nes: Fix nes_nic_cm_xmit() error handling
  RDMA/nes: Fix error handling issues
  RDMA/nes: Fix incorrect casts on 32-bit architectures
  IPoIB: Document newish features
  RDMA/cma: Create cm id even when IB port is down
  RDMA/cma: Use rate from IPoIB broadcast when joining IPoIB multicast groups
  IPoIB: Avoid free_netdev() BUG when destroying a child interface
  mlx4_core: Don't leak mailbox for SET_PORT on Ethernet ports
  RDMA/cxgb3: Release dependent resources only when endpoint memory is freed.
  RDMA/cxgb3: Handle EEH events
  IB/mlx4: Use pgprot_writecombine() for BlueFlame pages

1 files changed, 15 insertions, 10 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
index 5a76a5510350..4c57f329dd50 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
@@ -70,12 +70,14 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
          */
         if (ppriv->pkey == pkey) {
                 result = -ENOTUNIQ;
+                priv = NULL;
                 goto err;
         }
 
         list_for_each_entry(priv, &ppriv->child_intfs, list) {
                 if (priv->pkey == pkey) {
                         result = -ENOTUNIQ;
+                        priv = NULL;
                         goto err;
                 }
         }
@@ -96,7 +98,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
 
         result = ipoib_set_dev_features(priv, ppriv->ca);
         if (result)
-                goto device_init_failed;
+                goto err;
 
         priv->pkey = pkey;
 
@@ -109,7 +111,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
                 ipoib_warn(ppriv, "failed to initialize subinterface: "
                            "device %s, port %d",
                            ppriv->ca->name, ppriv->port);
-                goto device_init_failed;
+                goto err;
         }
 
         result = register_netdevice(priv->dev);
@@ -146,19 +148,19 @@ sysfs_failed:
 register_failed:
         ipoib_dev_cleanup(priv->dev);
 
-device_init_failed:
-        free_netdev(priv->dev);
-
 err:
         mutex_unlock(&ppriv->vlan_mutex);
         rtnl_unlock();
+        if (priv)
+                free_netdev(priv->dev);
+
         return result;
 }
 
 int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
 {
         struct ipoib_dev_priv *ppriv, *priv, *tpriv;
-        int ret = -ENOENT;
+        struct net_device *dev = NULL;
 
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
@@ -172,14 +174,17 @@ int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
                         unregister_netdevice(priv->dev);
                         ipoib_dev_cleanup(priv->dev);
                         list_del(&priv->list);
-                        free_netdev(priv->dev);
-
-                        ret = 0;
+                        dev = priv->dev;
                         break;
                 }
         }
         mutex_unlock(&ppriv->vlan_mutex);
         rtnl_unlock();
 
-        return ret;
+        if (dev) {
+                free_netdev(dev);
+                return 0;
+        }
+
+        return -ENODEV;
 }