Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0b00d3f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-linus-for-3.13-rc2' of... 

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.
parents 3441cded 7585ca0d

drivers/extcon/extcon-arizona.c

+1 −3
Original line number Diff line number Diff line
@@ -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");

drivers/extcon/extcon-class.c

+2 −1
Original line number Diff line number Diff line
@@ -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);