Commit e2057ee2 authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy Committed by Greg Kroah-Hartman
Browse files

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



"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: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210205100853.32372-3-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b31f1eb4

drivers/nvmem/qcom-spmi-sdam.c

+3 −4
Original line number Diff line number Diff line 
// 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)) {