OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update extcon for 3.13-rc2 

This patchset fix NULL pointer error of extcon-arizona driver and fix issue
 about memory of device groups when calling extcon_dev_unregister function.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJSlE6bAAoJEJzN3yze689TO0kP/RBPxYtC0xHmD9rpblWgj0AD
 GBOYtDwrm+4ZywN8KICIXLmi9RrmTFAXkLq8CYg2a05Ka92BuSF9xPfwOPEARrmg
 Em+ujJrC+0pixh5/bG3fh4SWg6a/AkfiJKAjgMkonGEVf/70pTHK4lBqlJUUDXaj
 XbX6pHP2hHLwKf0+aFTgN0VTtXWubnupL7YGEzVC4S8OhrIxKVr7DwQuCa96SjBR
 0TnIMkAjHv0FyeiztvtJQndxNk+Tx4WGsAxJpTuIxOOCHG50RQkvsQz0fwW5UVHn
 o/Targyu6WVm4eund6zwynmcEDgpV2+Gc8bewL80gK8GaMdSAd6ZaOwZZfMOHr7x
 Ss2Xev/RK7RLUNuRTY3eFFHB0XB+oWV+3AET41r58vLjGNjxKHgCtrQlmpKLgiOM
 AXn5cdK1VrSrIhFG0vj9b05WZWq26IR+JGJZfEm3CB+uyUrGI5MTOcdli5mJIJv8
 58F0Ud8fX9vysSp+S99DxFEyEpcTjKtJb0DldSDYp88le9bDgDbwx+NGaZ3EFWyr
 rQ83pQtziVmcIsj9MdpUGf6yZktS850Q46+VGUvw3X3Zn15S6y7AT6JM3RiZUKrR
 esN/NXDDyF3msvRsCrOEcYdC5U8oVAmNnVHfr17gqdf6kOmDlCaxZ0zcR2JIsfhq
 ah+o6ejQDZogiNCm+l/R
 =uXZ4
 -----END PGP SIGNATURE-----

Merge tag 'extcon-linus-for-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus

Chanwoo writes:

Update extcon for 3.13-rc2

This patchset fix NULL pointer error of extcon-arizona driver and fix issue
about memory of device groups when calling extcon_dev_unregister function.
This commit is contained in:
Greg Kroah-Hartman 2013-11-27 15:16:54 -08:00
parent 3441cded65 7585ca0dc9
commit d0b00d3fb9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/extcon/extcon-arizona.c
View File

@ -1082,7 +1082,7 @@ static void arizona_micd_set_level(struct arizona *arizona, int index,
static int arizona_extcon_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
struct arizona_pdata *pdata;
struct arizona_pdata *pdata = &arizona->pdata;
struct arizona_extcon_info *info;
unsigned int val;
int jack_irq_fall, jack_irq_rise;
@ -1091,8 +1091,6 @@ static int arizona_extcon_probe(struct platform_device *pdev)
if (!arizona->dapm || !arizona->dapm->card)
return -EPROBE_DEFER;
pdata = dev_get_platdata(arizona->dev);
info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);
if (!info) {
dev_err(&pdev->dev, "Failed to allocate memory\n");

3
drivers/extcon/extcon-class.c
View File

@ -792,6 +792,8 @@ void extcon_dev_unregister(struct extcon_dev *edev)
return;
}
device_unregister(&edev->dev);
if (edev->mutually_exclusive && edev->max_supported) {
for (index = 0; edev->mutually_exclusive[index];
index++)
@ -812,7 +814,6 @@ void extcon_dev_unregister(struct extcon_dev *edev)
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);