---

yaml --- r: 168969 b: refs/heads/master c: d5ccd67 h: refs/heads/master i: 168967: a128684 v: v3
git-mirror · Nov 30, 2009 · 0f8f613 · 0f8f613
1 parent b1d14f9
commit 0f8f613
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c53b1b15e222244358d3cbbefd2a13920faa352
+refs/heads/master: d5ccd67bb77ced5249067d05171992a7d5020393
diff --git a/trunk/drivers/net/smc91x.c b/trunk/drivers/net/smc91x.c
@@ -2283,7 +2283,7 @@ static int __devinit smc_drv_probe(struct platform_device *pdev)
 
 	ndev->irq = ires->start;
 
-	if (ires->flags & IRQF_TRIGGER_MASK)
+	if (irq_flags == -1 || ires->flags & IRQF_TRIGGER_MASK)
 		irq_flags = ires->flags & IRQF_TRIGGER_MASK;
 
 	ret = smc_request_attrib(pdev, ndev);