git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
[pandora-kernel.git]
/
drivers
/
net
/
sfc
/
falcon.c
diff --git
a/drivers/net/sfc/falcon.c
b/drivers/net/sfc/falcon.c
index
1b8d836
..
08278e7
100644
(file)
--- a/
drivers/net/sfc/falcon.c
+++ b/
drivers/net/sfc/falcon.c
@@
-15,6
+15,7
@@
#include <linux/seq_file.h>
#include <linux/i2c.h>
#include <linux/mii.h>
#include <linux/seq_file.h>
#include <linux/i2c.h>
#include <linux/mii.h>
+#include <linux/slab.h>
#include "net_driver.h"
#include "bitfield.h"
#include "efx.h"
#include "net_driver.h"
#include "bitfield.h"
#include "efx.h"
@@
-1319,7
+1320,9
@@
static int falcon_probe_nvconfig(struct efx_nic *efx)
EFX_LOG(efx, "PHY is %d phy_id %d\n", efx->phy_type, efx->mdio.prtad);
EFX_LOG(efx, "PHY is %d phy_id %d\n", efx->phy_type, efx->mdio.prtad);
- falcon_probe_board(efx, board_rev);
+ rc = falcon_probe_board(efx, board_rev);
+ if (rc)
+ goto fail2;
kfree(nvconfig);
return 0;
kfree(nvconfig);
return 0;