diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:27:29 +0200 |
| commit | 5ce001b0e56638c726270d4f9e05d46d4250dfbb (patch) | |
| tree | c21cf007ddef99d5e8b23dde9621bd9152e676a8 /drivers/net/sfc/xfp_phy.c | |
| parent | 7c9f8861e6c9c839f913e49b98c3854daca18f27 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into stackprotectortip-stackprotector-2008-06-25_10.27_Wed
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), |