diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-09 22:34:25 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 22:34:25 +0200 |
| commit | f974a8ec96571535ee07880a023bcce0e3f2c76b (patch) | |
| tree | 5cf09207b1ad292a55275cd0b24999fa29b9dfe8 /drivers/net/sfc/xfp_phy.c | |
| parent | [ARM] 5143/1: pxa: further cleanup PXA Kconfig by removing one (diff) | |
| parent | [ARM] mach-types update (diff) | |
| download | linux-f974a8ec96571535ee07880a023bcce0e3f2c76b.tar.xz linux-f974a8ec96571535ee07880a023bcce0e3f2c76b.zip | |
Merge branch 'machtypes' into pxa-palm
Diffstat (limited to 'drivers/net/sfc/xfp_phy.c')
| -rw-r--r-- | drivers/net/sfc/xfp_phy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/sfc/xfp_phy.c b/drivers/net/sfc/xfp_phy.c index 3b9f9ddbc372..f3684ad28887 100644 --- a/drivers/net/sfc/xfp_phy.c +++ b/drivers/net/sfc/xfp_phy.c @@ -85,7 +85,9 @@ static int xfp_phy_init(struct efx_nic *efx) int rc; phy_data = kzalloc(sizeof(struct xfp_phy_data), GFP_KERNEL); - efx->phy_data = (void *) phy_data; + if (!phy_data) + return -ENOMEM; + efx->phy_data = phy_data; EFX_INFO(efx, "XFP: PHY ID reg %x (OUI %x model %x revision" " %x)\n", devid, MDIO_ID_OUI(devid), MDIO_ID_MODEL(devid), |