Mike Chan <[email protected]> writes:
> Checking if the resource is already registered and adding to the list
> must be atomic or bad things can happen.
>
> Signed-off-by: Mike Chan <[email protected]>
Functionally, this looks fine. Some procedural details still to work
out:
Are you the original author of this? or was it Chunqiu or Limei? The
changelog should be prefixed with a From: line of the original author
(handled by git-format-patch) if it was not you. Also add the other's
signoffs if appropriate.
What tree does this apply to? It's not specified, and does not apply
to either current PM branch or pm-2.6.29.
Kevin
> ---
> arch/arm/plat-omap/resource.c | 14 +++++++++-----
> 1 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/plat-omap/resource.c b/arch/arm/plat-omap/resource.c
> index e9ace13..9d20249 100644
> --- a/arch/arm/plat-omap/resource.c
> +++ b/arch/arm/plat-omap/resource.c
> @@ -253,6 +253,7 @@ int resource_refresh(void)
> */
> int resource_register(struct shared_resource *resp)
> {
> + int ret = 0;
> if (!resp)
> return -EINVAL;
>
> @@ -260,13 +261,15 @@ int resource_register(struct shared_resource *resp)
> return -EINVAL;
>
> /* Verify that the resource is not already registered */
> - if (resource_lookup(resp->name))
> - return -EEXIST;
> + down(&res_mutex);
> + if (_resource_lookup(resp->name)) {
> + ret = -EEXIST;
> + goto out;
> + }
>
> INIT_LIST_HEAD(&resp->users_list);
> mutex_init(&resp->resource_mutex);
>
> - down(&res_mutex);
> /* Add the resource to the resource list */
> list_add(&resp->node, &res_list);
>
> @@ -274,10 +277,11 @@ int resource_register(struct shared_resource *resp)
> if (resp->ops->init)
> resp->ops->init(resp);
>
> - up(&res_mutex);
> pr_debug("resource: registered %s\n", resp->name);
>
> - return 0;
> +out:
> + up(&res_mutex);
> + return ret;
> }
> EXPORT_SYMBOL(resource_register);
>
> --
> 1.5.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
