History

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

Linus Torvalds committed 8 months ago

Commit 5abeba62 parents d249037 2d85ecd2 files · +2 −4Browse files

Unified · Split

2 files
  1. drivers/regulator/mt6363-regulator.c +1 −3
  2. drivers/regulator/pf9453-regulator.c +1 −1
drivers/regulator/mt6363-regulator.c+1−3
@@ -899,10 +899,8 @@ static int mt6363_regulator_probe(struct platform_device *pdev) · 898 unmodified lines
899 "Failed to map IRQ%d\n", info->hwirq);899 "Failed to map IRQ%d\n", info->hwirq);
900 900
901 ret = devm_add_action_or_reset(dev, mt6363_irq_remove, &info->virq);901 ret = devm_add_action_or_reset(dev, mt6363_irq_remove, &info->virq);
902 if (ret) {902 if (ret)
903 irq_dispose_mapping(info->hwirq);
904 return ret;903 return ret;
905 }
906 904
907 config.driver_data = info;905 config.driver_data = info;
908 INIT_DELAYED_WORK(&info->oc_work, mt6363_oc_irq_enable_work);906 INIT_DELAYED_WORK(&info->oc_work, mt6363_oc_irq_enable_work);
drivers/regulator/pf9453-regulator.c+1−1
@@ -809,7 +809,7 @@ static int pf9453_i2c_probe(struct i2c_client *i2c) · 808 unmodified lines
809 }809 }
810 810
811 ret = devm_request_threaded_irq(pf9453->dev, pf9453->irq, NULL, pf9453_irq_handler,811 ret = devm_request_threaded_irq(pf9453->dev, pf9453->irq, NULL, pf9453_irq_handler,
812 (IRQF_TRIGGER_FALLING | IRQF_ONESHOT),812 IRQF_ONESHOT,
813 "pf9453-irq", pf9453);813 "pf9453-irq", pf9453);
814 if (ret)814 if (ret)
815 return dev_err_probe(pf9453->dev, ret, "Failed to request IRQ: %d\n", pf9453->irq);815 return dev_err_probe(pf9453->dev, ret, "Failed to request IRQ: %d\n", pf9453->irq);