From: Ivan T. Ivanov Date: Wed, 18 Nov 2015 00:06:44 +0000 (-0800) Subject: mfd: qcom-spmi-pmic: Don't access non-existing registers X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=742dcd115cb523f4b518bfcda870e10a027a8024;p=openwrt%2Fstaging%2Fblogic.git mfd: qcom-spmi-pmic: Don't access non-existing registers Revision ID registers are available only on devices with Slave IDs that are even, so don't make access to unavailable registers. Signed-off-by: Ivan T. Ivanov [sboyd@codeaurora.org: Consider all slave ids that are even] Signed-off-by: Stephen Boyd Signed-off-by: Lee Jones --- diff --git a/drivers/mfd/qcom-spmi-pmic.c b/drivers/mfd/qcom-spmi-pmic.c index af6ac1c4b45c..8653e8b9bb4f 100644 --- a/drivers/mfd/qcom-spmi-pmic.c +++ b/drivers/mfd/qcom-spmi-pmic.c @@ -127,7 +127,9 @@ static int pmic_spmi_probe(struct spmi_device *sdev) if (IS_ERR(regmap)) return PTR_ERR(regmap); - pmic_spmi_show_revid(regmap, &sdev->dev); + /* Only the first slave id for a PMIC contains this information */ + if (sdev->usid % 2 == 0) + pmic_spmi_show_revid(regmap, &sdev->dev); return of_platform_populate(root, NULL, NULL, &sdev->dev); }