diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/net/ucc_geth.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/net/ucc_geth.c')
| -rw-r--r-- | drivers/net/ucc_geth.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c index 8d456e379a86..4ffd8739f8b7 100644 --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c | |||
| @@ -3614,9 +3614,6 @@ static irqreturn_t ucc_geth_irq_handler(int irq, void *info) | |||
| 3614 | 3614 | ||
| 3615 | ugeth_vdbg("%s: IN", __FUNCTION__); | 3615 | ugeth_vdbg("%s: IN", __FUNCTION__); |
| 3616 | 3616 | ||
| 3617 | if (!ugeth) | ||
| 3618 | return IRQ_NONE; | ||
| 3619 | |||
| 3620 | uccf = ugeth->uccf; | 3617 | uccf = ugeth->uccf; |
| 3621 | ug_info = ugeth->ug_info; | 3618 | ug_info = ugeth->ug_info; |
| 3622 | 3619 | ||