---

yaml --- r: 282247 b: refs/heads/master c: 45bcf01 h: refs/heads/master i: 282245: 39f0198 282243: 44024f1 282239: baf507b v: v3
git-mirror · Dec 15, 2011 · 29b7c04 · 29b7c04
1 parent 04353a9
commit 29b7c04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85d37226fb5faaf7bec55df50c2cd029bd6bb3cd
+refs/heads/master: 45bcf018d1a4779d592764ef57517c92589d55d7
diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c
@@ -4072,10 +4072,10 @@ static int hpsa_request_irq(struct ctlr_info *h,
 
 	if (h->msix_vector || h->msi_vector)
 		rc = request_irq(h->intr[h->intr_mode], msixhandler,
-				IRQF_DISABLED, h->devname, h);
+				0, h->devname, h);
 	else
 		rc = request_irq(h->intr[h->intr_mode], intxhandler,
-				IRQF_DISABLED, h->devname, h);
+				IRQF_SHARED, h->devname, h);
 	if (rc) {
 		dev_err(&h->pdev->dev, "unable to get irq %d for %s\n",
 		       h->intr[h->intr_mode], h->devname);