2 files changed, 7 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index 3b6985557cb2..3538da16e3fe 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -686,7 +686,7 @@ err_out_table:
         mthca_table_put(dev, dev->mr_table.mpt_table, key);
 
 err_out_mpt_free:
-        mthca_free(&dev->mr_table.mpt_alloc, mr->ibmr.lkey);
+        mthca_free(&dev->mr_table.mpt_alloc, key);
         return err;
 }
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 7dd2ec473d24..52b1bebfa744 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -824,7 +824,6 @@ void ipoib_cm_dev_stop(struct net_device *dev)
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_cm_rx *p;
         unsigned long begin;
-        LIST_HEAD(list);
         int ret;
 
         if (!IPOIB_CM_SUPPORTED(dev->dev_addr) || !priv->cm.id)
@@ -857,9 +856,12 @@ void ipoib_cm_dev_stop(struct net_device *dev)
                         /*
                          * assume the HW is wedged and just free up everything.
                          */
-                        list_splice_init(&priv->cm.rx_flush_list, &list);
-                        list_splice_init(&priv->cm.rx_error_list, &list);
-                        list_splice_init(&priv->cm.rx_drain_list, &list);
+                        list_splice_init(&priv->cm.rx_flush_list,
+                                         &priv->cm.rx_reap_list);
+                        list_splice_init(&priv->cm.rx_error_list,
+                                         &priv->cm.rx_reap_list);
+                        list_splice_init(&priv->cm.rx_drain_list,
+                                         &priv->cm.rx_reap_list);
                         break;
                 }
                 spin_unlock_irq(&priv->lock);