From 6db7352bb46962f2d5b2b7d2667043c8acadabc7 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Fri, 18 Sep 2009 12:59:22 -0700 Subject: [PATCH] --- yaml --- r: 175206 b: refs/heads/master c: 82c7c11fdbbf4a741524daf16f320909ef0d666a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/octeon/ethernet-rgmii.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d2060eba6865..600aec71b88d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6dbc0126beedc43f19abb5870c892f7bd105b2c +refs/heads/master: 82c7c11fdbbf4a741524daf16f320909ef0d666a diff --git a/trunk/drivers/staging/octeon/ethernet-rgmii.c b/trunk/drivers/staging/octeon/ethernet-rgmii.c index 8704133fe127..fbaa465d2fac 100644 --- a/trunk/drivers/staging/octeon/ethernet-rgmii.c +++ b/trunk/drivers/staging/octeon/ethernet-rgmii.c @@ -308,7 +308,7 @@ int cvm_oct_rgmii_init(struct net_device *dev) /* * Due to GMX errata in CN3XXX series chips, it is necessary - * to take the link down immediately whne the PHY changes + * to take the link down immediately when the PHY changes * state. In order to do this we call the poll function every * time the RGMII inband status changes. This may cause * problems if the PHY doesn't implement inband status @@ -317,6 +317,8 @@ int cvm_oct_rgmii_init(struct net_device *dev) if (number_rgmii_ports == 0) { r = request_irq(OCTEON_IRQ_RML, cvm_oct_rgmii_rml_interrupt, IRQF_SHARED, "RGMII", &number_rgmii_ports); + if (r != 0) + return r; } number_rgmii_ports++;