Skip to content

Commit 9d49882

Browse files
raagjadavandy-shev
authored andcommitted
pinctrl: baytrail: add warning for BYT_VAL_REG retrieval failure
Add warning for BYT_VAL_REG retrieval failure and continue such case to avoid unintended reads/writes in pm_ops. Signed-off-by: Raag Jadav <raag.jadav@intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> Link: https://lore.kernel.org/r/20230616203356.27343-3-raag.jadav@intel.com Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent 5a9fa4c commit 9d49882

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/pinctrl/intel/pinctrl-baytrail.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,6 +1758,10 @@ static int byt_gpio_suspend(struct device *dev)
17581758
vg->context.pads[i].conf0 = value;
17591759

17601760
reg = byt_gpio_reg(vg, pin, BYT_VAL_REG);
1761+
if (!reg) {
1762+
dev_warn(vg->dev, "Pin %i: can't retrieve VAL\n", i);
1763+
continue;
1764+
}
17611765
value = readl(reg) & BYT_VAL_RESTORE_MASK;
17621766
vg->context.pads[i].val = value;
17631767
}
@@ -1794,6 +1798,10 @@ static int byt_gpio_resume(struct device *dev)
17941798
}
17951799

17961800
reg = byt_gpio_reg(vg, pin, BYT_VAL_REG);
1801+
if (!reg) {
1802+
dev_warn(vg->dev, "Pin %i: can't retrieve VAL\n", i);
1803+
continue;
1804+
}
17971805
value = readl(reg);
17981806
if ((value & BYT_VAL_RESTORE_MASK) !=
17991807
vg->context.pads[i].val) {

0 commit comments

Comments
 (0)