summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-06-01 01:53:16 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-06-01 01:53:15 -0700
commit8cbd99868803ef8782eaaff370d8c67f55ad1897 (patch)
tree42ff8bcdceba046ccc2b6624e08fad921c26c28f
parent36d10a388216648e64165d661ccc8fe1de923437 (diff)
parent64cdc7585d954917c8fd2fd27af0d6f317a86334 (diff)
Merge "pinctrl: lpi: Avoid null pointer access in dbg_show"
-rw-r--r--drivers/pinctrl/qcom/pinctrl-lpi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/qcom/pinctrl-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpi.c
index e5269cffe568..e383f4b42599 100644
--- a/drivers/pinctrl/qcom/pinctrl-lpi.c
+++ b/drivers/pinctrl/qcom/pinctrl-lpi.c
@@ -465,6 +465,7 @@ static void lpi_gpio_dbg_show_one(struct seq_file *s,
"pull up"
};
+ pctldev = pctldev ? : to_gpio_state(chip)->ctrl;
pindesc = pctldev->desc->pins[offset];
pad = pctldev->desc->pins[offset].drv_data;
ctl_reg = lpi_gpio_read(pad, LPI_GPIO_REG_DIR_CTL);