summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2007-01-08 11:24:26 -0800
committerJeff Garzik <jeff@garzik.org>2007-01-09 02:24:37 -0500
commitab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb (patch)
tree5aeead7516591abd1b7ce5ce2e553151e00bef4b
parent45d2530167027e96686a1b6a7892c55af1f516f5 (diff)
downloadlinux-ab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb.tar.gz
linux-ab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb.tar.bz2
linux-ab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb.zip
chelsio: error path fix
Fix handling of allocation failure. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/chelsio/my3126.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/chelsio/my3126.c
index c7731b6f9de3..82fed1dd5005 100644
--- a/drivers/net/chelsio/my3126.c
+++ b/drivers/net/chelsio/my3126.c
@@ -170,9 +170,10 @@ static struct cphy *my3126_phy_create(adapter_t *adapter,
{
struct cphy *cphy = kzalloc(sizeof (*cphy), GFP_KERNEL);
- if (cphy)
- cphy_init(cphy, adapter, phy_addr, &my3126_ops, mdio_ops);
+ if (!cphy)
+ return NULL;
+ cphy_init(cphy, adapter, phy_addr, &my3126_ops, mdio_ops);
INIT_DELAYED_WORK(&cphy->phy_update, my3216_poll);
cphy->bmsr = 0;