mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 03:04:51 +01:00
regulator: Fixes for v7.0
A couple of small, driver specific fixes which might not even have much impact if you have the affected devices depending on your setup. -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmmrBo0ACgkQJNaLcl1U h9Bf6gf9HpD980t31lKKUDEJXwQ+Cg2A4NnoZYRsDU0ZW9Z/f8SY4Ea2O3Jyj4Ce 0s76ebgbYEowxamdsPBqISvQTbS7VUiWV9Fsx8y2CcKiAf7qFZ4GarlL8pjvTnsy mcFFdIvQ/7yAREjRyZAyuv3B1SJT5kJ+IUhEtBzkBAQUkqcKpjIpNHJZ9QG2OCof 6fg/xABYDkEAoB3z26nRC63ilP7QUDdi+XQyhOi2hUUgbFW6f0ZUM9+IFuR04PYb 36LYmI5NffpVRsCxfkSSGck6Sp98/bNgdp6Z9UPk7B0j3ZxXX/GN1LqlmY7zKcho V5bUsqXQ6r2Fw5SYcf8C86N9WSKY4w== =F20s -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
5abeba615c
2 changed files with 2 additions and 4 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue