diff --git a/[refs] b/[refs]
index 75c813871489..85fee45fb0cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60460dfd425e3d301831d8dd6398620d67bbda2b
+refs/heads/master: 9edbd990bb60dd7678f7f4f8ca3d92e03a1f0e67
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/trunk/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
index a97548ee6a97..996bbb05c396 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c
@@ -273,7 +273,7 @@ int ipath_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 	while (1) {
 		if (n == NULL) {
 			spin_unlock_irqrestore(&mcast_lock, flags);
-			ret = 0;
+			ret = -EINVAL;
 			goto bail;
 		}