IB/ipath: Fix two more spin lock problems

Ralph Campbell · Roland Dreier · commit 6ed89b957477 · 2007-05-06T21:18:11.000-07:00
Fix a missing unlock in ipath_rc_rcv_resp() and remove an extra unlock
from ipath_rc_rcv_error().

Signed-off-by: Ralph Campbell &lt;ralph.campbell@qlogic.com&gt;
Signed-off-by: Roland Dreier &lt;rolandd@cisco.com&gt;
diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
@@ -1257,6 +1257,7 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
 	wc.dlid_path_bits = 0;
 	wc.port_num = 0;
 	ipath_sqerror_qp(qp, &wc);
+	spin_unlock_irqrestore(&qp->s_lock, flags);
 bail:
 	return;
 }
@@ -1436,7 +1437,6 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
 		break;
 	}
 	qp->r_nak_state = 0;
-	spin_unlock_irq(&qp->s_lock);
 	tasklet_hi_schedule(&qp->s_task);
 
 unlock_done:

Original file line number	Diff line number	Diff line change
`@@ -1257,6 +1257,7 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,`
`1257`	`1257`	`wc.dlid_path_bits = 0;`
`1258`	`1258`	`wc.port_num = 0;`
`1259`	`1259`	`ipath_sqerror_qp(qp, &wc);`
	`1260`	`+ spin_unlock_irqrestore(&qp->s_lock, flags);`
`1260`	`1261`	`bail:`
`1261`	`1262`	`return;`
`1262`	`1263`	`}`
`@@ -1436,7 +1437,6 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,`
`1436`	`1437`	`break;`
`1437`	`1438`	`}`
`1438`	`1439`	`qp->r_nak_state = 0;`
`1439`		`- spin_unlock_irq(&qp->s_lock);`
`1440`	`1440`	`tasklet_hi_schedule(&qp->s_task);`
`1441`	`1441`
`1442`	`1442`	`unlock_done:`