From d9b89b1dfcc5a627e85f00516aa85622463284cf Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 8 Jan 2007 11:24:26 -0800 Subject: [PATCH] --- yaml --- r: 45393 b: refs/heads/master c: ab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb h: refs/heads/master i: 45391: 40734212838a5ec1cf538950f6e29cb45b465f20 v: v3 --- [refs] | 2 +- trunk/drivers/net/chelsio/my3126.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2f9ee55016b6..aa46b25b6c56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45d2530167027e96686a1b6a7892c55af1f516f5 +refs/heads/master: ab3b1c7e82fe6094a07baa5d2cb0138c4cb40fcb diff --git a/trunk/drivers/net/chelsio/my3126.c b/trunk/drivers/net/chelsio/my3126.c index c7731b6f9de3..82fed1dd5005 100644 --- a/trunk/drivers/net/chelsio/my3126.c +++ b/trunk/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;