Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29279d21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-v5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio 

Pull GPIO fixes from Linus Walleij:
 "Not much to say about them, regular fixes:

   - Fix a bug on the errorpath of gpiochip_add_data_with_key()

   - IRQ type setting on the spreadtrum GPIO driver"

* tag 'gpio-v5.1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: Fix gpiochip_add_data_with_key() error path
  gpio: eic: sprd: Fix incorrect irq type setting for the sync EIC
parents 4e40f0f3 35779890

drivers/gpio/gpio-eic-sprd.c

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ static int sprd_eic_irq_set_type(struct irq_data *data, unsigned int flow_type) 
			irq_set_handler_locked(data, handle_edge_irq);

			break;

		case IRQ_TYPE_EDGE_BOTH:

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTMODE, 0);

			sprd_eic_update(chip, offset, SPRD_EIC_SYNC_INTBOTH, 1);

			irq_set_handler_locked(data, handle_edge_irq);

			break;

drivers/gpio/gpiolib.c

+8 −4
Original line number Diff line number Diff line
@@ -1379,7 +1379,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data, 


	status = gpiochip_add_irqchip(chip, lock_key, request_key);

	if (status)

		goto err_remove_chip;

		goto err_free_gpiochip_mask;



	status = of_gpiochip_add(chip);

	if (status)
@@ -1387,7 +1387,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data, 


	status = gpiochip_init_valid_mask(chip);

	if (status)

		goto err_remove_chip;

		goto err_remove_of_chip;



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

		struct gpio_desc *desc = &gdev->descs[i];
@@ -1415,14 +1415,18 @@ int gpiochip_add_data_with_key(struct gpio_chip *chip, void *data, 
	if (gpiolib_initialized) {

		status = gpiochip_setup_dev(gdev);

		if (status)

			goto err_remove_chip;

			goto err_remove_acpi_chip;

	}

	return 0;



err_remove_chip:

err_remove_acpi_chip:

	acpi_gpiochip_remove(chip);

err_remove_of_chip:

	gpiochip_free_hogs(chip);

	of_gpiochip_remove(chip);

err_remove_chip:

	gpiochip_irqchip_remove(chip);

err_free_gpiochip_mask:

	gpiochip_free_valid_mask(chip);

err_remove_irqchip_mask:

	gpiochip_irqchip_free_valid_mask(chip);