Commit 5abeba61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v7.0-rc2' of... 

Merge tag 'regulator-fix-v7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of small, driver specific fixes which might not even have
  much impact if you have the affected devices depending on your setup"

* tag 'regulator-fix-v7.0-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: pf9453: Respect IRQ trigger settings from firmware
  regulator: mt6363: Fix incorrect and redundant IRQ disposal in probe
parents d249037a 2d85ecd6

drivers/regulator/mt6363-regulator.c

+1 −3
Original line number Diff line number Diff line
@@ -899,10 +899,8 @@ static int mt6363_regulator_probe(struct platform_device *pdev) 
					     "Failed to map IRQ%d\n", info->hwirq);



		ret = devm_add_action_or_reset(dev, mt6363_irq_remove, &info->virq);

		if (ret) {

			irq_dispose_mapping(info->hwirq);

		if (ret)

			return ret;

		}



		config.driver_data = info;

		INIT_DELAYED_WORK(&info->oc_work, mt6363_oc_irq_enable_work);

drivers/regulator/pf9453-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -809,7 +809,7 @@ static int pf9453_i2c_probe(struct i2c_client *i2c) 
	}



	ret = devm_request_threaded_irq(pf9453->dev, pf9453->irq, NULL, pf9453_irq_handler,

					(IRQF_TRIGGER_FALLING | IRQF_ONESHOT),

					IRQF_ONESHOT,

					"pf9453-irq", pf9453);

	if (ret)

		return dev_err_probe(pf9453->dev, ret, "Failed to request IRQ: %d\n", pf9453->irq);