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

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

Merge tag 'extcon-fixes-for-4.1-rc2' of... 

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

Chanwoo writes:

Update extcon for v4.1-rc2

This patchset fixes the NULL pointer deference issue of extcon-usb-gpio.c
to prevent the interrupt occur before device initialization.
parents 5ebe6afa bc1aabad

drivers/extcon/extcon-usb-gpio.c

+12 −12
Original line number Diff line number Diff line
@@ -119,6 +119,18 @@ static int usb_extcon_probe(struct platform_device *pdev) 
		return PTR_ERR(info->id_gpiod);

	}



	info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable);

	if (IS_ERR(info->edev)) {

		dev_err(dev, "failed to allocate extcon device\n");

		return -ENOMEM;

	}



	ret = devm_extcon_dev_register(dev, info->edev);

	if (ret < 0) {

		dev_err(dev, "failed to register extcon device\n");

		return ret;

	}



	ret = gpiod_set_debounce(info->id_gpiod,

				 USB_GPIO_DEBOUNCE_MS * 1000);

	if (ret < 0)
@@ -142,18 +154,6 @@ static int usb_extcon_probe(struct platform_device *pdev) 
		return ret;

	}



	info->edev = devm_extcon_dev_allocate(dev, usb_extcon_cable);

	if (IS_ERR(info->edev)) {

		dev_err(dev, "failed to allocate extcon device\n");

		return -ENOMEM;

	}



	ret = devm_extcon_dev_register(dev, info->edev);

	if (ret < 0) {

		dev_err(dev, "failed to register extcon device\n");

		return ret;

	}



	platform_set_drvdata(pdev, info);

	device_init_wakeup(dev, 1);