p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'topic/trivial' into for-next 

Pull various trivial fixes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-11-29 09:30:29 +01:00
parent 6dbc6caf66 cf576fe5fd
commit 886cd11f7b
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/drivers/dummy.c
View File

@ -830,7 +830,7 @@ static int snd_dummy_capsrc_put(struct snd_kcontrol *kcontrol, struct snd_ctl_el
static int snd_dummy_iobox_info(struct snd_kcontrol *kcontrol, static int snd_dummy_iobox_info(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *info) struct snd_ctl_elem_info *info)
{ {
const char *const names[] = { "None", "CD Player" }; static const char *const names[] = { "None", "CD Player" };
return snd_ctl_enum_info(info, 1, 2, names); return snd_ctl_enum_info(info, 1, 2, names);
} }

5
sound/isa/gus/gus_dma.c
View File

@ -201,10 +201,9 @@ int snd_gf1_dma_transfer_block(struct snd_gus_card * gus,
struct snd_gf1_dma_block *block; struct snd_gf1_dma_block *block;
block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL); block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
if (block == NULL) { if (!block)
snd_printk(KERN_ERR "gf1: DMA transfer failure; not enough memory\n");
return -ENOMEM; return -ENOMEM;
}
*block = *__block; *block = *__block;
block->next = NULL; block->next = NULL;

2
sound/mips/hal2.c
View File

@ -814,7 +814,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip)
struct hpc3_regs *hpc3 = hpc3c0; struct hpc3_regs *hpc3 = hpc3c0;
int err; int err;
hal2 = kzalloc(sizeof(struct snd_hal2), GFP_KERNEL); hal2 = kzalloc(sizeof(*hal2), GFP_KERNEL);
if (!hal2) if (!hal2)
return -ENOMEM; return -ENOMEM;

2
sound/mips/sgio2audio.c
View File

@ -840,7 +840,7 @@ static int snd_sgio2audio_create(struct snd_card *card,
if (!(readq(&mace->perif.audio.control) & AUDIO_CONTROL_CODEC_PRESENT)) if (!(readq(&mace->perif.audio.control) & AUDIO_CONTROL_CODEC_PRESENT))
return -ENOENT; return -ENOENT;
chip = kzalloc(sizeof(struct snd_sgio2audio), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;

1
sound/pci/korg1212/korg1212.c
View File

@ -2348,7 +2348,6 @@ static int snd_korg1212_create(struct snd_card *card, struct pci_dev *pci,
err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev); err = request_firmware(&dsp_code, "korg/k1212.dsp", &pci->dev);
if (err < 0) { if (err < 0) {
release_firmware(dsp_code);
snd_printk(KERN_ERR "firmware not available\n"); snd_printk(KERN_ERR "firmware not available\n");
snd_korg1212_free(korg1212); snd_korg1212_free(korg1212);
return err; return err;