summaryrefslogtreecommitdiff
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-13 09:53:34 +0300
committerGrant Likely <grant.likely@secretlab.ca>2011-02-13 09:53:34 +0300
commitc170093d31bd4e3bc51881cc0f123beeca7872c9 (patch)
treed93cd280d525dd339f33be010c75b7fd0bacd690 /drivers/net/gianfar.c
parent557218e2d662574bc58d840fe116c7fd8d57aed8 (diff)
parent78bba987bc025a7263248501b453476e77b93331 (diff)
downloadlinux-c170093d31bd4e3bc51881cc0f123beeca7872c9.tar.xz
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 119aa2000c24..5ed8f9f9419f 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -1920,7 +1920,7 @@ int startup_gfar(struct net_device *ndev)
if (err) {
for (j = 0; j < i; j++)
free_grp_irqs(&priv->gfargrp[j]);
- goto irq_fail;
+ goto irq_fail;
}
}