Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

extcon: driver model release call not needed

Browse source 
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@gmail.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
This commit is contained in:
anish kumar 2012-10-22 09:43:33 +09:00 • committed by MyungJoo Ham
parent f8457d574f
commit 57e7cd3705
1 changed files with 35 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
drivers/extcon/extcon-class.c
View file

@ -545,47 +545,9 @@ static int create_extcon_class(void)
return 0; 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) static void extcon_dev_release(struct device *dev)
{ {
struct extcon_dev *edev = (struct extcon_dev *) dev_get_drvdata(dev); kfree(dev);
extcon_cleanup(edev, true);
} }
static const char *muex_name = "mutually_exclusive"; static const char *muex_name = "mutually_exclusive";
@ -811,7 +773,40 @@ EXPORT_SYMBOL_GPL(extcon_dev_register);
*/ */
void extcon_dev_unregister(struct extcon_dev *edev) void extcon_dev_unregister(struct extcon_dev *edev)
{ {
extcon_cleanup(edev, false); int index;
mutex_lock(&extcon_dev_list_lock);
list_del(&edev->entry);
mutex_unlock(&extcon_dev_list_lock);
if (IS_ERR_OR_NULL(get_device(edev->dev))) {
dev_err(edev->dev, "Failed to unregister extcon_dev (%s)\n",
dev_name(edev->dev));
return;
}
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); EXPORT_SYMBOL_GPL(extcon_dev_unregister);