From f8150dcdd3bdd0c4989c7d25901f6a837a3ea1cb Mon Sep 17 00:00:00 2001 From: Omar Ramirez Luna Date: Thu, 10 Jan 2013 03:37:00 -0600 Subject: [PATCH] --- yaml --- r: 354015 b: refs/heads/master c: 49720e0120b55b131f4e210ff66325dbfc8a9eab h: refs/heads/master i: 354013: ecb67055163756ee8c6b3247e93f1b4cbaad3b4d 354011: b3d3ec4d9c54f3d702da495f1ab89a236636c5a8 354007: dd48bfa06b16ad2d153431dbf54bd5cc54294220 353999: 3e80cc476bcc5debcfe8bd59ca166e8768a50a51 353983: bda895f7070e502311776ce8bbe803b7f28f6dc8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/tidspbridge/rmgr/nldr.c | 6 ++++-- trunk/drivers/staging/tidspbridge/rmgr/node.c | 12 ++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b24e629a068b..883e6bb200b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94c947cd4ec7c886df246f87255dc925e3a0a47f +refs/heads/master: 49720e0120b55b131f4e210ff66325dbfc8a9eab diff --git a/trunk/drivers/staging/tidspbridge/rmgr/nldr.c b/trunk/drivers/staging/tidspbridge/rmgr/nldr.c index 6309221b64a5..ca3805046a73 100644 --- a/trunk/drivers/staging/tidspbridge/rmgr/nldr.c +++ b/trunk/drivers/staging/tidspbridge/rmgr/nldr.c @@ -1802,8 +1802,6 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr, bool status1 = false; s32 i = 0; struct lib_node root = { NULL, 0, NULL }; - pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", __func__, (u32) nldr_node, - sym_addr, offset_range, (u32) offset_output, sym_name); if (nldr_node->dynamic && *nldr_node->phase_split) { switch (nldr_node->phase) { @@ -1852,6 +1850,10 @@ int nldr_find_addr(struct nldr_nodeobject *nldr_node, u32 sym_addr, pr_debug("%s: Address 0x%x not found in range %d.\n", __func__, sym_addr, offset_range); status = -ESPIPE; + } else { + pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", + __func__, (u32) nldr_node, sym_addr, offset_range, + (u32) offset_output, sym_name); } return status; diff --git a/trunk/drivers/staging/tidspbridge/rmgr/node.c b/trunk/drivers/staging/tidspbridge/rmgr/node.c index 737f4a9d86a3..87dfa92ab45b 100644 --- a/trunk/drivers/staging/tidspbridge/rmgr/node.c +++ b/trunk/drivers/staging/tidspbridge/rmgr/node.c @@ -3012,16 +3012,16 @@ int node_find_addr(struct node_mgr *node_mgr, u32 sym_addr, struct node_object *node_obj; int status = -ENOENT; - pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", __func__, - (unsigned int) node_mgr, - sym_addr, offset_range, - (unsigned int) sym_addr_output, sym_name); - list_for_each_entry(node_obj, &node_mgr->node_list, list_elem) { status = nldr_find_addr(node_obj->nldr_node_obj, sym_addr, offset_range, sym_addr_output, sym_name); - if (!status) + if (!status) { + pr_debug("%s(0x%x, 0x%x, 0x%x, 0x%x, %s)\n", __func__, + (unsigned int) node_mgr, + sym_addr, offset_range, + (unsigned int) sym_addr_output, sym_name); break; + } } return status;