Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: vx_core: Drop unused dev field

Browse Source 
The vx_core.dev field has never been set but referred incorrectly at
firmware loading.  Pass the proper device pointer from card->dev at
request_firmware(), and drop the unused dev field from vx_core, too.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20240807133452.9424-11-tiwai@suse.de
This commit is contained in:
Takashi Iwai 2024-08-07 15:34:00 +02:00
parent b5557ef985
commit b426b3ba9f
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/vx_core.h
View File

@ -155,7 +155,6 @@ struct vx_core {
unsigned int chip_status; unsigned int chip_status;
unsigned int pcm_running; unsigned int pcm_running;
struct device *dev;
struct snd_hwdep *hwdep; struct snd_hwdep *hwdep;
struct vx_rmh irq_rmh; /* RMH used in interrupts */ struct vx_rmh irq_rmh; /* RMH used in interrupts */

2
sound/drivers/vx/vx_hwdep.c
View File

@ -58,7 +58,7 @@ int snd_vx_setup_firmware(struct vx_core *chip)
if (! fw_files[chip->type][i]) if (! fw_files[chip->type][i])
continue; continue;
sprintf(path, "vx/%s", fw_files[chip->type][i]); sprintf(path, "vx/%s", fw_files[chip->type][i]);
if (request_firmware(&fw, path, chip->dev)) { if (request_firmware(&fw, path, chip->card->dev)) {
snd_printk(KERN_ERR "vx: can't load firmware %s\n", path); snd_printk(KERN_ERR "vx: can't load firmware %s\n", path);
return -ENOENT; return -ENOENT;
} }