From 4d974cc6053d715dae97f472455c75caf06bc10c Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Fri, 14 May 2010 04:27:30 +0000 Subject: [PATCH] --- yaml --- r: 195179 b: refs/heads/master c: 08d18f3b62b4c05731a09eca2b432842a0a18da5 h: refs/heads/master i: 195177: 2a2c105ff0f46c4fc40c89ee3f51b4e5211fb053 195175: 3480f990de550a1ae7abf70bb0a79ffe11d5c311 v: v3 --- [refs] | 2 +- trunk/drivers/net/fsl_pq_mdio.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b51b167ced86..786df8c7953e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2f79227138c71e08627af5f8961197364edbc98 +refs/heads/master: 08d18f3b62b4c05731a09eca2b432842a0a18da5 diff --git a/trunk/drivers/net/fsl_pq_mdio.c b/trunk/drivers/net/fsl_pq_mdio.c index 3acac5f930c8..ff028f59b930 100644 --- a/trunk/drivers/net/fsl_pq_mdio.c +++ b/trunk/drivers/net/fsl_pq_mdio.c @@ -277,15 +277,17 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, int tbiaddr = -1; const u32 *addrp; u64 addr = 0, size = 0; - int err = 0; + int err; priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; new_bus = mdiobus_alloc(); - if (NULL == new_bus) + if (!new_bus) { + err = -ENOMEM; goto err_free_priv; + } new_bus->name = "Freescale PowerQUICC MII Bus", new_bus->read = &fsl_pq_mdio_read,