Re: [PATCH] extcon: driver model release call not needed

From: anish kumar
Date: Sun Oct 21 2012 - 00:48:53 EST


Hi Choi,

This is based on http://git.infradead.org/users/kmpark/linux-samsung
this branch.
anish
On Sun, 2012-10-21 at 13:46 +0900, anish kumar wrote:
> From: anish kumar <anish198519851985@xxxxxxxxx>
>
> There was a case where free and list_del can be called twice
> on the same pointer.So fixed it by re-arranging the code and
> removing a function which was not needed.
>
> Signed-off-by: anish kumar <anish198519851985@xxxxxxxxx>
> ---
> drivers/extcon/extcon-class.c | 71 ++++++++++++++++++-----------------------
> 1 files changed, 31 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
> index 754f133..347db10 100644
> --- a/drivers/extcon/extcon-class.c
> +++ b/drivers/extcon/extcon-class.c
> @@ -544,47 +544,10 @@ static int create_extcon_class(void)
> return 0;
> }
>
> -static void extcon_cleanup(struct extcon_dev *edev, bool skip)
> -{
> - mutex_lock(&extcon_dev_list_lock);
> - list_del(&edev->entry);
> - mutex_unlock(&extcon_dev_list_lock);
> -
> - if (!skip && get_device(edev->dev)) {
> - int index;
> -
> - if (edev->mutually_exclusive && edev->max_supported) {
> - for (index = 0; edev->mutually_exclusive[index];
> - index++)
> - kfree(edev->d_attrs_muex[index].attr.name);
> - kfree(edev->d_attrs_muex);
> - kfree(edev->attrs_muex);
> - }
> -
> - for (index = 0; index < edev->max_supported; index++)
> - kfree(edev->cables[index].attr_g.name);
> -
> - if (edev->max_supported) {
> - kfree(edev->extcon_dev_type.groups);
> - kfree(edev->cables);
> - }
> -
> -#if defined(CONFIG_ANDROID)
> - if (switch_class)
> - class_compat_remove_link(switch_class, edev->dev, NULL);
> -#endif
> - device_unregister(edev->dev);
> - put_device(edev->dev);
> - }
> -
> - kfree(edev->dev);
> -}
> -
> static void extcon_dev_release(struct device *dev)
> {
> - struct extcon_dev *edev = (struct extcon_dev *) dev_get_drvdata(dev);
> -
> - extcon_cleanup(edev, true);
> + struct extcon_dev *edev = dev_get_drvdata(dev);
> + kfree(edev->dev);
> }
>
> static const char *muex_name = "mutually_exclusive";
> @@ -810,7 +773,35 @@ EXPORT_SYMBOL_GPL(extcon_dev_register);
> */
> void extcon_dev_unregister(struct extcon_dev *edev)
> {
> - extcon_cleanup(edev, false);
> + mutex_lock(&extcon_dev_list_lock);
> + list_del(&edev->entry);
> + mutex_unlock(&extcon_dev_list_lock);
> +
> + if (get_device(edev->dev) != NULL) {
> + int index;
> + if (edev->mutually_exclusive && edev->max_supported) {
> + for (index = 0; edev->mutually_exclusive[index];
> + index++)
> + kfree(edev->d_attrs_muex[index].attr.name);
> + kfree(edev->d_attrs_muex);
> + kfree(edev->attrs_muex);
> + }
> +
> + for (index = 0; index < edev->max_supported; index++)
> + kfree(edev->cables[index].attr_g.name);
> +
> + if (edev->max_supported) {
> + kfree(edev->extcon_dev_type.groups);
> + kfree(edev->cables);
> + }
> +
> +#if defined(CONFIG_ANDROID)
> + if (switch_class)
> + class_compat_remove_link(switch_class, edev->dev, NULL);
> +#endif
> + device_unregister(edev->dev);
> + put_device(edev->dev);
> + }
> }
> EXPORT_SYMBOL_GPL(extcon_dev_unregister);
>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/