diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2009-10-12 13:18:48 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-12 13:18:48 +0200 |
| commit | 6c60e0c30c80fcd53e61701b7865a85283f8a341 (patch) | |
| tree | b1450bb496d0036da71acba3fc22b6ab47fd2814 /drivers | |
| parent | net: Fix struct sock bitfield annotation (diff) | |
| download | linux-6c60e0c30c80fcd53e61701b7865a85283f8a341.tar.xz linux-6c60e0c30c80fcd53e61701b7865a85283f8a341.zip | |
acenic: Pass up error code from ace_load_firmware()
If ace_load_firmware() fails, ace_init() cleans up but still returns
0, leading to an oops as seen in <http://bugs.debian.org/521383>.
It should pass the error code up.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/acenic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 5f0b05c2d71f..d82a9a994753 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c @@ -1209,7 +1209,8 @@ static int __devinit ace_init(struct net_device *dev) memset(ap->info, 0, sizeof(struct ace_info)); memset(ap->skb, 0, sizeof(struct ace_skb)); - if (ace_load_firmware(dev)) + ecode = ace_load_firmware(dev); + if (ecode) goto init_error; ap->fw_running = 0; |