bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed IRQ freeing bug in e100 drivers.

This commit is contained in:
Florian Pose 2009-07-16 07:52:17 +00:00
parent 2ce7cf6466
commit f0904054f9
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devices/e100-2.6.20-ethercat.c
View File

@ -2186,7 +2186,7 @@ static int e100_up(struct nic *nic)
mod_timer(&nic->watchdog, jiffies); mod_timer(&nic->watchdog, jiffies);
} }
if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED, if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
nic->netdev->name, nic->netdev))) nic->netdev->name, nic->netdev)))
goto err_no_irq; goto err_no_irq;
if (!nic->ecdev) { if (!nic->ecdev) {
netif_wake_queue(nic->netdev); netif_wake_queue(nic->netdev);
@ -2215,8 +2215,8 @@ static void e100_down(struct nic *nic)
netif_stop_queue(nic->netdev); netif_stop_queue(nic->netdev);
} }
e100_hw_reset(nic); e100_hw_reset(nic);
free_irq(nic->pdev->irq, nic->netdev);
if (!nic->ecdev) { if (!nic->ecdev) {
free_irq(nic->pdev->irq, nic->netdev);
del_timer_sync(&nic->watchdog); del_timer_sync(&nic->watchdog);
netif_carrier_off(nic->netdev); netif_carrier_off(nic->netdev);
} }

4
devices/e100-2.6.24-ethercat.c
View File

@ -2195,7 +2195,7 @@ static int e100_up(struct nic *nic)
mod_timer(&nic->watchdog, jiffies); mod_timer(&nic->watchdog, jiffies);
} }
if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED, if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
nic->netdev->name, nic->netdev))) nic->netdev->name, nic->netdev)))
goto err_no_irq; goto err_no_irq;
if (!nic->ecdev) { if (!nic->ecdev) {
netif_wake_queue(nic->netdev); netif_wake_queue(nic->netdev);
@ -2224,8 +2224,8 @@ static void e100_down(struct nic *nic)
netif_stop_queue(nic->netdev); netif_stop_queue(nic->netdev);
} }
e100_hw_reset(nic); e100_hw_reset(nic);
free_irq(nic->pdev->irq, nic->netdev);
if (!nic->ecdev) { if (!nic->ecdev) {
free_irq(nic->pdev->irq, nic->netdev);
del_timer_sync(&nic->watchdog); del_timer_sync(&nic->watchdog);
netif_carrier_off(nic->netdev); netif_carrier_off(nic->netdev);
} }

4
devices/e100-2.6.26-ethercat.c
View File

@ -2266,7 +2266,7 @@ static int e100_up(struct nic *nic)
mod_timer(&nic->watchdog, jiffies); mod_timer(&nic->watchdog, jiffies);
} }
if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED, if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
nic->netdev->name, nic->netdev))) nic->netdev->name, nic->netdev)))
goto err_no_irq; goto err_no_irq;
if (!nic->ecdev) { if (!nic->ecdev) {
netif_wake_queue(nic->netdev); netif_wake_queue(nic->netdev);
@ -2295,8 +2295,8 @@ static void e100_down(struct nic *nic)
netif_stop_queue(nic->netdev); netif_stop_queue(nic->netdev);
} }
e100_hw_reset(nic); e100_hw_reset(nic);
free_irq(nic->pdev->irq, nic->netdev);
if (!nic->ecdev) { if (!nic->ecdev) {
free_irq(nic->pdev->irq, nic->netdev);
del_timer_sync(&nic->watchdog); del_timer_sync(&nic->watchdog);
netif_carrier_off(nic->netdev); netif_carrier_off(nic->netdev);
} }

4
devices/e100-2.6.28-ethercat.c
View File

@ -2266,7 +2266,7 @@ static int e100_up(struct nic *nic)
mod_timer(&nic->watchdog, jiffies); mod_timer(&nic->watchdog, jiffies);
} }
if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED, if((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
nic->netdev->name, nic->netdev))) nic->netdev->name, nic->netdev)))
goto err_no_irq; goto err_no_irq;
if (!nic->ecdev) { if (!nic->ecdev) {
netif_wake_queue(nic->netdev); netif_wake_queue(nic->netdev);
@ -2295,8 +2295,8 @@ static void e100_down(struct nic *nic)
netif_stop_queue(nic->netdev); netif_stop_queue(nic->netdev);
} }
e100_hw_reset(nic); e100_hw_reset(nic);
free_irq(nic->pdev->irq, nic->netdev);
if (!nic->ecdev) { if (!nic->ecdev) {
free_irq(nic->pdev->irq, nic->netdev);
del_timer_sync(&nic->watchdog); del_timer_sync(&nic->watchdog);
netif_carrier_off(nic->netdev); netif_carrier_off(nic->netdev);
} }

4
devices/e100-2.6.29-ethercat.c
View File

@ -2161,7 +2161,7 @@ static int e100_up(struct nic *nic)
mod_timer(&nic->watchdog, jiffies); mod_timer(&nic->watchdog, jiffies);
} }
if ((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED, if ((err = request_irq(nic->pdev->irq, e100_intr, IRQF_SHARED,
nic->netdev->name, nic->netdev))) nic->netdev->name, nic->netdev)))
goto err_no_irq; goto err_no_irq;
if (!nic->ecdev) { if (!nic->ecdev) {
netif_wake_queue(nic->netdev); netif_wake_queue(nic->netdev);
@ -2190,8 +2190,8 @@ static void e100_down(struct nic *nic)
netif_stop_queue(nic->netdev); netif_stop_queue(nic->netdev);
} }
e100_hw_reset(nic); e100_hw_reset(nic);
free_irq(nic->pdev->irq, nic->netdev);
if (!nic->ecdev) { if (!nic->ecdev) {
free_irq(nic->pdev->irq, nic->netdev);
del_timer_sync(&nic->watchdog); del_timer_sync(&nic->watchdog);
netif_carrier_off(nic->netdev); netif_carrier_off(nic->netdev);
} }