提交 1db557ec 编写于 作者: S Subbaraman Narayanamurthy 提交者: Zheng Zengkai

nvmem: qcom-spmi-sdam: Fix uninitialized pdev pointer

stable inclusion
from stable-5.10.20
commit 11d14267de25b3eb5ff785b35152181770a82940
bugzilla: 50608

--------------------------------

commit e2057ee2 upstream.

"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.

Fixes: 40ce9798 ("nvmem: add QTI SDAM driver")
Cc: stable@vger.kernel.org
Signed-off-by: NSubbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: NSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210205100853.32372-3-srinivas.kandagatla@linaro.orgSigned-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 b86bf3e9
// SPDX-License-Identifier: GPL-2.0-only // 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> #include <linux/device.h>
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#define SDAM_PBS_TRIG_CLR 0xE6 #define SDAM_PBS_TRIG_CLR 0xE6
struct sdam_chip { struct sdam_chip {
struct platform_device *pdev;
struct regmap *regmap; struct regmap *regmap;
struct nvmem_config sdam_config; struct nvmem_config sdam_config;
unsigned int base; unsigned int base;
...@@ -65,7 +64,7 @@ static int sdam_read(void *priv, unsigned int offset, void *val, ...@@ -65,7 +64,7 @@ static int sdam_read(void *priv, unsigned int offset, void *val,
size_t bytes) size_t bytes)
{ {
struct sdam_chip *sdam = priv; struct sdam_chip *sdam = priv;
struct device *dev = &sdam->pdev->dev; struct device *dev = sdam->sdam_config.dev;
int rc; int rc;
if (!sdam_is_valid(sdam, offset, bytes)) { if (!sdam_is_valid(sdam, offset, bytes)) {
...@@ -86,7 +85,7 @@ static int sdam_write(void *priv, unsigned int offset, void *val, ...@@ -86,7 +85,7 @@ static int sdam_write(void *priv, unsigned int offset, void *val,
size_t bytes) size_t bytes)
{ {
struct sdam_chip *sdam = priv; struct sdam_chip *sdam = priv;
struct device *dev = &sdam->pdev->dev; struct device *dev = sdam->sdam_config.dev;
int rc; int rc;
if (!sdam_is_valid(sdam, offset, bytes)) { if (!sdam_is_valid(sdam, offset, bytes)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册