Mercurial Mercurial > etherlabmaster / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Fixed unprocessed interrupts in e100 driver.
authorFlorian Pose <fp@igh-essen.com>
Wed, 19 Nov 2008 17:10:04 +0000
changeset 1316 d01d9cce8b59
parent 1315 26b4f94cfdfb
child 1317 09173a2de40c
Fixed unprocessed interrupts in e100 driver.
devices/e100-2.6.20-ethercat.c file | annotate | diff | comparison | revisions
devices/e100-2.6.24-ethercat.c file | annotate | diff | comparison | revisions
devices/e100-2.6.26-ethercat.c file | annotate | diff | comparison | revisions 
--- a/devices/e100-2.6.20-ethercat.c	Tue Nov 18 11:20:30 2008 +0000
+++ b/devices/e100-2.6.20-ethercat.c	Wed Nov 19 17:10:04 2008 +0000
@@ -2193,9 +2193,11 @@
 	e100_start_receiver(nic, NULL);
     if (!nic->ecdev) {
 		mod_timer(&nic->watchdog, jiffies);
-        if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
-                        nic->netdev->name, nic->netdev)))
-            goto err_no_irq;
+	}
+	if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
+					nic->netdev->name, nic->netdev)))
+		goto err_no_irq;
+	if (!nic->ecdev) {
         netif_wake_queue(nic->netdev);
         netif_poll_enable(nic->netdev);
         /* enable ints _after_ enabling poll, preventing a race between
--- a/devices/e100-2.6.24-ethercat.c	Tue Nov 18 11:20:30 2008 +0000
+++ b/devices/e100-2.6.24-ethercat.c	Wed Nov 19 17:10:04 2008 +0000
@@ -2202,9 +2202,11 @@
 	e100_start_receiver(nic, NULL);
 	if (!nic->ecdev) {
 		mod_timer(&nic->watchdog, jiffies);
-		if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
-						nic->netdev->name, nic->netdev)))
-			goto err_no_irq;
+	}
+	if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
+					nic->netdev->name, nic->netdev)))
+		goto err_no_irq;
+	if (!nic->ecdev) {
 		netif_wake_queue(nic->netdev);
 		napi_enable(&nic->napi);
 		/* enable ints _after_ enabling poll, preventing a race between
--- a/devices/e100-2.6.26-ethercat.c	Tue Nov 18 11:20:30 2008 +0000
+++ b/devices/e100-2.6.26-ethercat.c	Wed Nov 19 17:10:04 2008 +0000
@@ -2273,9 +2273,11 @@
 	e100_start_receiver(nic, NULL);
 	if (!nic->ecdev) {
 		mod_timer(&nic->watchdog, jiffies);
-		if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
-						nic->netdev->name, nic->netdev)))
-			goto err_no_irq;
+	}
+	if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
+					nic->netdev->name, nic->netdev)))
+		goto err_no_irq;
+	if (!nic->ecdev) {
 		netif_wake_queue(nic->netdev);
 		napi_enable(&nic->napi);
 		/* enable ints _after_ enabling poll, preventing a race between
etherlabmaster