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

Commit 148c46f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc fix from Greg KH:
 "Here is one fix, in the extcon subsystem, that resolves a reported
  issue.

  It's been in linux-next for a number of weeks now, sorry for not
  getting it to you sooner"

* tag 'char-misc-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  extcon: usb-gpio: register extcon device before IRQ registration
parents 92752b5c 0f5b6ec6

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);