diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/net/acenic.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/net/acenic.c')
| -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) | |||
| 1209 | memset(ap->info, 0, sizeof(struct ace_info)); | 1209 | memset(ap->info, 0, sizeof(struct ace_info)); |
| 1210 | memset(ap->skb, 0, sizeof(struct ace_skb)); | 1210 | memset(ap->skb, 0, sizeof(struct ace_skb)); |
| 1211 | 1211 | ||
| 1212 | if (ace_load_firmware(dev)) | 1212 | ecode = ace_load_firmware(dev); |
| 1213 | if (ecode) | ||
| 1213 | goto init_error; | 1214 | goto init_error; |
| 1214 | 1215 | ||
| 1215 | ap->fw_running = 0; | 1216 | ap->fw_running = 0; |