Commit 98c6b8a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix an irq mapping leak in gpio-sim

 - associate the GPIO device's software node with the irq domain in
   gpio-sim

* tag 'gpio-fixes-for-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: sim: pass the GPIO device's software node to irq domain
  gpio: sim: dispose of irq mappings before destroying the irq_sim domain
parents a87eaffb 6e39c1ac

drivers/gpio/gpio-sim.c

+14 −1
Original line number Diff line number Diff line
@@ -291,6 +291,15 @@ static void gpio_sim_mutex_destroy(void *data) 
	mutex_destroy(lock);

}



static void gpio_sim_dispose_mappings(void *data)

{

	struct gpio_sim_chip *chip = data;

	unsigned int i;



	for (i = 0; i < chip->gc.ngpio; i++)

		irq_dispose_mapping(irq_find_mapping(chip->irq_sim, i));

}



static void gpio_sim_sysfs_remove(void *data)

{

	struct gpio_sim_chip *chip = data;
@@ -402,10 +411,14 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev) 
	if (!chip->pull_map)

		return -ENOMEM;



	chip->irq_sim = devm_irq_domain_create_sim(dev, NULL, num_lines);

	chip->irq_sim = devm_irq_domain_create_sim(dev, swnode, num_lines);

	if (IS_ERR(chip->irq_sim))

		return PTR_ERR(chip->irq_sim);



	ret = devm_add_action_or_reset(dev, gpio_sim_dispose_mappings, chip);

	if (ret)

		return ret;



	mutex_init(&chip->lock);

	ret = devm_add_action_or_reset(dev, gpio_sim_mutex_destroy,

				       &chip->lock);