Skip to contentSkip to conversation

NET: cassini, fix lock imbalance

PATCH Applied Jiri Slaby 2 participants 2 messages Nov 6, 2009 – Nov 7, 2009

Subsystems (2)
lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 NET: cassini, fix lock imbalance

Stanse found that one error path in cas_open omits to unlock pm_mutex. Fix that.

---
 drivers/net/cassini.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
drivers/net/cassini.c +3 -2
index 05916aa..f857afe 100644
@@ -4342,11 +4342,11 @@ static int cas_open(struct net_device *dev)
 		cas_unlock_all_restore(cp, flags);
 	}
 
+	err = -ENOMEM;
 	if (cas_tx_tiny_alloc(cp) < 0)
-		return -ENOMEM;
+		goto err_unlock;
 
 	/* alloc rx descriptors */
-	err = -ENOMEM;
 	if (cas_alloc_rxds(cp) < 0)
 		goto err_tx_tiny;
 
@@ -4386,6 +4386,7 @@ err_spare:
 	cas_free_rxds(cp);
 err_tx_tiny:
 	cas_tx_tiny_free(cp);
+err_unlock:
 	mutex_unlock(&cp->pm_mutex);
 	return err;
 }
Signature · 1 line
1.6.4.2