Commit c808f2ad authored Aug 09, 2019 by Linus Torvalds

Merge tag 'pwm/for-5.3-rc4' of...

Merge tag 'pwm/for-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm

Pull pwm fix from Thierry Reding:
 "A single fix for a backlight brightness regression introduced in
  this merge window"

* tag 'pwm/for-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm:
  pwm: Fallback to the static lookup-list when acpi_pwm_get fails

parents cb42f06c 6cf9481b

drivers/pwm/core.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -882,8 +882,11 @@ struct pwm_device pwm_get(struct device dev, const char *con_id)
		return of_pwm_get(dev, dev->of_node, con_id);

		/* then lookup via ACPI */
		if (dev && is_acpi_node(dev->fwnode))
		return acpi_pwm_get(dev->fwnode);
		if (dev && is_acpi_node(dev->fwnode)) {
		pwm = acpi_pwm_get(dev->fwnode);
		if (!IS_ERR(pwm) \|\| PTR_ERR(pwm) != -ENOENT)
		return pwm;
		}

		/*
		* We look up the provider in the static table typically provided by

Admin message