Commit 886cd11f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/trivial' into for-next 



Pull various trivial fixes.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 6dbc6caf cf576fe5

sound/drivers/dummy.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

				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);

}

sound/isa/gus/gus_dma.c

+2 −3
Original line number Diff line number Diff line
@@ -201,10 +201,9 @@ int snd_gf1_dma_transfer_block(struct snd_gus_card * gus, 
	struct snd_gf1_dma_block *block;



	block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);

	if (block == NULL) {

		snd_printk(KERN_ERR "gf1: DMA transfer failure; not enough memory\n");

	if (!block)

		return -ENOMEM;

	}



	*block = *__block;

	block->next = NULL;

sound/mips/hal2.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static int hal2_create(struct snd_card *card, struct snd_hal2 **rchip) 
	struct hpc3_regs *hpc3 = hpc3c0;

	int err;



	hal2 = kzalloc(sizeof(struct snd_hal2), GFP_KERNEL);

	hal2 = kzalloc(sizeof(*hal2), GFP_KERNEL);

	if (!hal2)

		return -ENOMEM;

sound/mips/sgio2audio.c

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ static int snd_sgio2audio_create(struct snd_card *card, 
	if (!(readq(&mace->perif.audio.control) & AUDIO_CONTROL_CODEC_PRESENT))

		return -ENOENT;



	chip = kzalloc(sizeof(struct snd_sgio2audio), GFP_KERNEL);

	chip = kzalloc(sizeof(*chip), GFP_KERNEL);

	if (chip == NULL)

		return -ENOMEM;

sound/pci/korg1212/korg1212.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

	if (err < 0) {

		release_firmware(dsp_code);

		snd_printk(KERN_ERR "firmware not available\n");

		snd_korg1212_free(korg1212);

		return err;