regulator: da9121: Request IRQ directly and free in release function to avoid masking race

Signed-off-by: Adam Ward <Adam.Ward.opensource@diasemi.com>
Link: https://lore.kernel.org/r/24b2d8b0c3536408369add034221b1141e58bbfc.1606908582.git.Adam.Ward.opensource@diasemi.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Adam Ward 2020-12-02 11:32:47 +00:00 коммит произвёл Mark Brown
Родитель 40bb5b02ff
Коммит 5e191d2e05
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 24D68B725D5487D0
1 изменённых файлов: 6 добавлений и 3 удалений

Просмотреть файл

@ -945,8 +945,7 @@ static int da9121_config_irq(struct i2c_client *i2c,
chip->passive_delay = p_delay;
ret = devm_request_threaded_irq(chip->dev,
chip->chip_irq, NULL,
ret = request_threaded_irq(chip->chip_irq, NULL,
da9121_irq_handler,
IRQF_TRIGGER_LOW|IRQF_ONESHOT,
"da9121", chip);
@ -960,7 +959,7 @@ static int da9121_config_irq(struct i2c_client *i2c,
if (ret != 0) {
dev_err(chip->dev, "Failed to set IRQ masks: %d\n",
ret);
goto error;
goto regmap_error;
}
INIT_DELAYED_WORK(&chip->work, da9121_status_poll_on);
@ -969,6 +968,9 @@ static int da9121_config_irq(struct i2c_client *i2c,
}
error:
return ret;
regmap_error:
free_irq(chip->chip_irq, chip);
return ret;
}
static const struct of_device_id da9121_dt_ids[] = {
@ -1036,6 +1038,7 @@ static int da9121_i2c_remove(struct i2c_client *i2c)
const int mask_all[4] = { 0xFF, 0xFF, 0xFF, 0xFF };
int ret = 0;
free_irq(chip->chip_irq, chip);
cancel_delayed_work_sync(&chip->work);
ret = regmap_bulk_write(chip->regmap, DA9121_REG_SYS_MASK_0, mask_all, 4);