---

yaml --- r: 205802 b: refs/heads/master c: 3746bfd h: refs/heads/master v: v3
git-mirror · Jul 8, 2010 · 96ee282 · 96ee282
1 parent 649e0a7
commit 96ee282
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9020dea38032ac17b096628b2e102245de3863ac
+refs/heads/master: 3746bfd51d8108d43c06064481065afc07bbcc1d
diff --git a/trunk/drivers/staging/slicoss/slicoss.c b/trunk/drivers/staging/slicoss/slicoss.c
@@ -2646,22 +2646,21 @@ static int slic_upr_request(struct adapter *adapter,
 		     u32 upr_data_h,
 		     u32 upr_buffer, u32 upr_buffer_h)
 {
-	int status;
+	int rc;
 
 	spin_lock_irqsave(&adapter->upr_lock.lock, adapter->upr_lock.flags);
-	status = slic_upr_queue_request(adapter,
+	rc = slic_upr_queue_request(adapter,
 					upr_request,
 					upr_data,
 					upr_data_h, upr_buffer, upr_buffer_h);
-	if (status != 0) {
-		spin_unlock_irqrestore(&adapter->upr_lock.lock,
-					adapter->upr_lock.flags);
-		return status;
-	}
+	if (rc)
+		goto err_unlock_irq;
+
 	slic_upr_start(adapter);
+err_unlock_irq:
 	spin_unlock_irqrestore(&adapter->upr_lock.lock,
 				adapter->upr_lock.flags);
-	return 0;
+	return rc;
 }
 
 static void slic_upr_request_complete(struct adapter *adapter, u32 isr)