From 89b022038fed3b8a9a622e6e3aa2bb044cfedfa9 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Thu, 18 Dec 2008 08:23:33 +0000 Subject: [PATCH] --- yaml --- r: 122785 b: refs/heads/master c: 3e73fc9a12679a546284d597c1f19165792d0b83 h: refs/heads/master i: 122783: 41d207eca423a90aaad16acd43e92c2fb3ff905a v: v3 --- [refs] | 2 +- trunk/drivers/net/ucc_geth.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 745d722db224..78ef4c415318 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba574696a34eb518979e742b35ccd30dec284583 +refs/heads/master: 3e73fc9a12679a546284d597c1f19165792d0b83 diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/drivers/net/ucc_geth.c index 052ad71365de..defdad445ecb 100644 --- a/trunk/drivers/net/ucc_geth.c +++ b/trunk/drivers/net/ucc_geth.c @@ -2218,7 +2218,10 @@ static void ucc_geth_memclean(struct ucc_geth_private *ugeth) while (!list_empty(&ugeth->ind_hash_q)) put_enet_addr_container(ENET_ADDR_CONT_ENTRY (dequeue(&ugeth->ind_hash_q))); - + if (ugeth->ug_regs) { + iounmap(ugeth->ug_regs); + ugeth->ug_regs = NULL; + } } static void ucc_geth_set_multi(struct net_device *dev) @@ -2423,7 +2426,12 @@ static int ucc_struct_init(struct ucc_geth_private *ugeth) return -ENOMEM; } - ugeth->ug_regs = (struct ucc_geth __iomem *) ioremap(uf_info->regs, sizeof(struct ucc_geth)); + ugeth->ug_regs = ioremap(uf_info->regs, sizeof(*ugeth->ug_regs)); + if (!ugeth->ug_regs) { + if (netif_msg_probe(ugeth)) + ugeth_err("%s: Failed to ioremap regs.", __func__); + return -ENOMEM; + } return 0; } @@ -3689,7 +3697,7 @@ static int ucc_geth_open(struct net_device *dev) if (err) { if (netif_msg_ifup(ugeth)) ugeth_err("%s: Cannot configure internal struct, aborting.", dev->name); - return err; + goto out_err_stop; } napi_enable(&ugeth->napi); @@ -3752,6 +3760,7 @@ static int ucc_geth_open(struct net_device *dev) out_err: napi_disable(&ugeth->napi); +out_err_stop: ucc_geth_stop(ugeth); return err; }