| Message ID | 1612376126-31001-1-git-send-email-subbaram@codeaurora.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e2057ee29973b9741d43d3f475a6b02fb46a0e61 |
| Headers | show |
| Series | [RESEND] nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer | expand |
On 03/02/2021 18:15, Subbaraman Narayanamurthy wrote: > "sdam->pdev" is uninitialized and it is used to print error logs. > Fix it. Since device pointer can be used from sdam_config, use it > directly thereby removing pdev pointer. > > Cc: stable@vger.kernel.org > Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org> > --- Applied thanks, --srini > drivers/nvmem/qcom-spmi-sdam.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c > index a72704c..f6e9f96 100644 > --- a/drivers/nvmem/qcom-spmi-sdam.c > +++ b/drivers/nvmem/qcom-spmi-sdam.c > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > - * Copyright (c) 2017, 2020 The Linux Foundation. All rights reserved. > + * Copyright (c) 2017, 2020-2021, The Linux Foundation. All rights reserved. > */ > > #include <linux/device.h> > @@ -18,7 +18,6 @@ > #define SDAM_PBS_TRIG_CLR 0xE6 > > struct sdam_chip { > - struct platform_device *pdev; > struct regmap *regmap; > struct nvmem_config sdam_config; > unsigned int base; > @@ -65,7 +64,7 @@ static int sdam_read(void *priv, unsigned int offset, void *val, > size_t bytes) > { > struct sdam_chip *sdam = priv; > - struct device *dev = &sdam->pdev->dev; > + struct device *dev = sdam->sdam_config.dev; > int rc; > > if (!sdam_is_valid(sdam, offset, bytes)) { > @@ -86,7 +85,7 @@ static int sdam_write(void *priv, unsigned int offset, void *val, > size_t bytes) > { > struct sdam_chip *sdam = priv; > - struct device *dev = &sdam->pdev->dev; > + struct device *dev = sdam->sdam_config.dev; > int rc; > > if (!sdam_is_valid(sdam, offset, bytes)) { >
Hello: This patch was applied to qcom/linux.git (refs/heads/for-next): On Wed, 3 Feb 2021 10:15:26 -0800 you wrote: > "sdam->pdev" is uninitialized and it is used to print error logs. > Fix it. Since device pointer can be used from sdam_config, use it > directly thereby removing pdev pointer. > > Cc: stable@vger.kernel.org > Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org> > > [...] Here is the summary with links: - [RESEND] nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer https://git.kernel.org/qcom/c/e2057ee29973 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/nvmem/qcom-spmi-sdam.c b/drivers/nvmem/qcom-spmi-sdam.c index a72704c..f6e9f96 100644 --- a/drivers/nvmem/qcom-spmi-sdam.c +++ b/drivers/nvmem/qcom-spmi-sdam.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2017, 2020 The Linux Foundation. All rights reserved. + * Copyright (c) 2017, 2020-2021, The Linux Foundation. All rights reserved. */ #include <linux/device.h> @@ -18,7 +18,6 @@ #define SDAM_PBS_TRIG_CLR 0xE6 struct sdam_chip { - struct platform_device *pdev; struct regmap *regmap; struct nvmem_config sdam_config; unsigned int base; @@ -65,7 +64,7 @@ static int sdam_read(void *priv, unsigned int offset, void *val, size_t bytes) { struct sdam_chip *sdam = priv; - struct device *dev = &sdam->pdev->dev; + struct device *dev = sdam->sdam_config.dev; int rc; if (!sdam_is_valid(sdam, offset, bytes)) { @@ -86,7 +85,7 @@ static int sdam_write(void *priv, unsigned int offset, void *val, size_t bytes) { struct sdam_chip *sdam = priv; - struct device *dev = &sdam->pdev->dev; + struct device *dev = sdam->sdam_config.dev; int rc; if (!sdam_is_valid(sdam, offset, bytes)) {
"sdam->pdev" is uninitialized and it is used to print error logs. Fix it. Since device pointer can be used from sdam_config, use it directly thereby removing pdev pointer. Cc: stable@vger.kernel.org Signed-off-by: Subbaraman Narayanamurthy <subbaram@codeaurora.org> --- drivers/nvmem/qcom-spmi-sdam.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)