Skip to content

Commit 85951e1

Browse files
committed
Merge tag 'pinctrl-v6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pin control fixes from Linus Walleij: - Fix potential NULL dereference in the i.MX driver - Fix the pull up/down resistor values in the Meson driver - Fix the mapping of the PHY LED pins in the Airhoa driver - Fix EINT interrupts on older controllers and a debounce value issue in the Mediatek driver - Fix an erronoeus PINGROUP define in the Qualcomm driver * tag 'pinctrl-v6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: pinctrl: qcom: Fix PINGROUP definition for sm8750 pinctrl: mediatek: common-v1: Fix error checking in mtk_eint_init() pinctrl: mediatek: Fix new design debounce issue pinctrl: mediatek: common-v1: Fix EINT breakage on older controllers pinctrl: airoha: fix wrong PHY LED mapping and PHY2 LED defines pinctrl: meson: define the pull up/down resistor value as 60 kOhm pinctrl: imx: Return NULL if no group is matched and found
2 parents 8164851 + 12b8a67 commit 85951e1

File tree

6 files changed

+87
-98
lines changed

6 files changed

+87
-98
lines changed

drivers/pinctrl/freescale/pinctrl-imx.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ static inline const struct group_desc *imx_pinctrl_find_group_by_name(
3737
struct pinctrl_dev *pctldev,
3838
const char *name)
3939
{
40-
const struct group_desc *grp = NULL;
40+
const struct group_desc *grp;
4141
int i;
4242

4343
for (i = 0; i < pctldev->num_groups; i++) {
4444
grp = pinctrl_generic_get_group(pctldev, i);
4545
if (grp && !strcmp(grp->grp.name, name))
46-
break;
46+
return grp;
4747
}
4848

49-
return grp;
49+
return NULL;
5050
}
5151

5252
static void imx_pin_dbg_show(struct pinctrl_dev *pctldev, struct seq_file *s,

drivers/pinctrl/mediatek/mtk-eint.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ int mtk_eint_set_debounce(struct mtk_eint *eint, unsigned long eint_num,
449449
return -EOPNOTSUPP;
450450

451451
virq = irq_find_mapping(eint->domain, eint_num);
452-
eint_offset = (eint_num % 4) * 8;
452+
eint_offset = (idx % 4) * 8;
453453
d = irq_get_irq_data(virq);
454454

455455
set_offset = (idx / 4) * 4 + eint->regs->dbnc_set;

0 commit comments

Comments
 (0)