gpio fixes for v6.12-rc2
- fix a potential NULL-pointer dereference in gpiolib core - fix a probe() regression from the v6.12 merge window and an older bug leading to missed interrupts in gpio-davinci -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEFp3rbAvDxGAT0sefEacuoBRx13IFAmb/+PwACgkQEacuoBRx 13KLAg//e5/DUfObPKOLR+8Oox1aZmR76L5bUU301u+bQsMykqzK2dd10c9z1JJM 2Uax0Ye0+tLVYCsVulhuhiYGp5v+6j7aiKg54PIBSXDTTjDQWYh02LilKFXaZga4 //t0SyZQ4RlU+smasitPh41y71IUmuCiVazTkW/oHfrNdD5fv101PTLJQ53lgV+9 nHWelUa4e30gXv7ruIa2KafW3opH0PG25eB1IFpUbwklB1Qhd+eu68lcjoVfiYOW roNhE9Mgkn2fkKyigOqSqF8GsCIgoAS1Yxaf7OQwGD5Zgla9AoP27N2S8EL9yJA9 QqczFxioCBny66VggXe7HktqkzGwNvDVDOGhB1xGC7etoIxz+TniACj9yX2LXe3P lA3/5tuuXN9SNk5tmcLkZmNWkAu64rK5YbKFV9aqY/cnz6e0R2kycjNivFYI843N 69hSl7NZe6JJOOvUfzC+RD+8TV6vXQ+uBqx0sYloyj6zW3k6+hUeLbIeeL1IxZY2 sKNZc9XSQ0RuqZZEpVcv3wdG/g3PMWXDMmkBCPqIoaz5N/EcpUNR8DXEteJKDbX2 O2THrAJGSgFhe1pPBYwbJ3p1/BXQKIljDcEj22DdzDEnYyHFqD/zEpMj2WDrduLE ZTHrIEPenr+EQD5SYUPDEWHWjKQHE3aWnBhWDSBoccYQf743J8Q= =JlY/ -----END PGP SIGNATURE----- Merge tag 'gpio-fixes-for-v6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux Pull gpio fixes from Bartosz Golaszewski: - fix a potential NULL-pointer dereference in gpiolib core - fix a probe() regression from the v6.12 merge window and an older bug leading to missed interrupts in gpio-davinci * tag 'gpio-fixes-for-v6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpiolib: Fix potential NULL pointer dereference in gpiod_get_label() gpio: davinci: Fix condition for irqchip registration gpio: davinci: fix lazy disable
This commit is contained in:
commit
cc70ce8fcc
@ -253,7 +253,7 @@ static int davinci_gpio_probe(struct platform_device *pdev)
|
||||
* serve as EDMA event triggers.
|
||||
*/
|
||||
|
||||
static void gpio_irq_disable(struct irq_data *d)
|
||||
static void gpio_irq_mask(struct irq_data *d)
|
||||
{
|
||||
struct davinci_gpio_regs __iomem *g = irq2regs(d);
|
||||
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
|
||||
@ -262,7 +262,7 @@ static void gpio_irq_disable(struct irq_data *d)
|
||||
writel_relaxed(mask, &g->clr_rising);
|
||||
}
|
||||
|
||||
static void gpio_irq_enable(struct irq_data *d)
|
||||
static void gpio_irq_unmask(struct irq_data *d)
|
||||
{
|
||||
struct davinci_gpio_regs __iomem *g = irq2regs(d);
|
||||
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
|
||||
@ -288,8 +288,8 @@ static int gpio_irq_type(struct irq_data *d, unsigned trigger)
|
||||
|
||||
static struct irq_chip gpio_irqchip = {
|
||||
.name = "GPIO",
|
||||
.irq_enable = gpio_irq_enable,
|
||||
.irq_disable = gpio_irq_disable,
|
||||
.irq_unmask = gpio_irq_unmask,
|
||||
.irq_mask = gpio_irq_mask,
|
||||
.irq_set_type = gpio_irq_type,
|
||||
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
|
||||
};
|
||||
@ -472,7 +472,7 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
|
||||
return PTR_ERR(clk);
|
||||
}
|
||||
|
||||
if (chips->gpio_unbanked) {
|
||||
if (!chips->gpio_unbanked) {
|
||||
irq = devm_irq_alloc_descs(dev, -1, 0, ngpio, 0);
|
||||
if (irq < 0) {
|
||||
dev_err(dev, "Couldn't allocate IRQ numbers\n");
|
||||
|
@ -114,12 +114,12 @@ const char *gpiod_get_label(struct gpio_desc *desc)
|
||||
srcu_read_lock_held(&desc->gdev->desc_srcu));
|
||||
|
||||
if (test_bit(FLAG_USED_AS_IRQ, &flags))
|
||||
return label->str ?: "interrupt";
|
||||
return label ? label->str : "interrupt";
|
||||
|
||||
if (!test_bit(FLAG_REQUESTED, &flags))
|
||||
return NULL;
|
||||
|
||||
return label->str;
|
||||
return label ? label->str : NULL;
|
||||
}
|
||||
|
||||
static void desc_free_label(struct rcu_head *rh)
|
||||
|
Loading…
Reference in New Issue
Block a user