Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-7
+5
-5
drivers/gpio/gpio-davinci.c
+5
-5
drivers/gpio/gpio-davinci.c
···
253
253
* serve as EDMA event triggers.
254
254
*/
255
255
256
-
static void gpio_irq_disable(struct irq_data *d)
256
+
static void gpio_irq_mask(struct irq_data *d)
257
257
{
258
258
struct davinci_gpio_regs __iomem *g = irq2regs(d);
259
259
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
···
262
262
writel_relaxed(mask, &g->clr_rising);
263
263
}
264
264
265
-
static void gpio_irq_enable(struct irq_data *d)
265
+
static void gpio_irq_unmask(struct irq_data *d)
266
266
{
267
267
struct davinci_gpio_regs __iomem *g = irq2regs(d);
268
268
uintptr_t mask = (uintptr_t)irq_data_get_irq_handler_data(d);
···
288
288
289
289
static struct irq_chip gpio_irqchip = {
290
290
.name = "GPIO",
291
-
.irq_enable = gpio_irq_enable,
292
-
.irq_disable = gpio_irq_disable,
291
+
.irq_unmask = gpio_irq_unmask,
292
+
.irq_mask = gpio_irq_mask,
293
293
.irq_set_type = gpio_irq_type,
294
294
.flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE,
295
295
};
···
472
472
return PTR_ERR(clk);
473
473
}
474
474
475
-
if (chips->gpio_unbanked) {
475
+
if (!chips->gpio_unbanked) {
476
476
irq = devm_irq_alloc_descs(dev, -1, 0, ngpio, 0);
477
477
if (irq < 0) {
478
478
dev_err(dev, "Couldn't allocate IRQ numbers\n");
+2
-2
drivers/gpio/gpiolib.c
+2
-2
drivers/gpio/gpiolib.c
···
114
114
srcu_read_lock_held(&desc->gdev->desc_srcu));
115
115
116
116
if (test_bit(FLAG_USED_AS_IRQ, &flags))
117
-
return label->str ?: "interrupt";
117
+
return label ? label->str : "interrupt";
118
118
119
119
if (!test_bit(FLAG_REQUESTED, &flags))
120
120
return NULL;
121
121
122
-
return label->str;
122
+
return label ? label->str : NULL;
123
123
}
124
124
125
125
static void desc_free_label(struct rcu_head *rh)