Unverified Commit ba85883d authored by Venkata Prasad Potturu's avatar Venkata Prasad Potturu Committed by Mark Brown
Browse files

ASoC: amd: acp: Fix NULL pointer deref on acp resume path 



update chip data using dev_get_drvdata(dev->parent) instead of
dev_get_platdata(dev).

BUG: kernel NULL pointer dereference, address: 0000000000000010
Call Trace:
 <TASK>
 ? __pfx_platform_pm_resume+0x10/0x10
 platform_pm_resume+0x28/0x60
 dpm_run_callback+0x51/0x1a0
 device_resume+0x1a6/0x2b0
 dpm_resume+0x168/0x230

Fixes: e3933683 ("ASoC: amd: acp: Remove redundant acp_dev_data structure")

Signed-off-by: default avatarVenkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://patch.msgid.link/20250425060144.1773265-1-venkataprasad.potturu@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c1b0f518

sound/soc/amd/acp/acp-rembrandt.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static void rembrandt_audio_remove(struct platform_device *pdev) 


static int rmb_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);

	struct acp_stream *stream;

	struct snd_pcm_substream *substream;

	snd_pcm_uframes_t buf_in_frames;

sound/soc/amd/acp/acp-renoir.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void renoir_audio_remove(struct platform_device *pdev) 


static int rn_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);

	struct acp_stream *stream;

	struct snd_pcm_substream *substream;

	snd_pcm_uframes_t buf_in_frames;

sound/soc/amd/acp/acp63.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static void acp63_audio_remove(struct platform_device *pdev) 


static int acp63_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);

	struct acp_stream *stream;

	struct snd_pcm_substream *substream;

	snd_pcm_uframes_t buf_in_frames;

sound/soc/amd/acp/acp70.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void acp_acp70_audio_remove(struct platform_device *pdev) 


static int acp70_pcm_resume(struct device *dev)

{

	struct acp_chip_info *chip = dev_get_platdata(dev);

	struct acp_chip_info *chip = dev_get_drvdata(dev->parent);

	struct acp_stream *stream;

	struct snd_pcm_substream *substream;

	snd_pcm_uframes_t buf_in_frames;