Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae97dd9a authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] NULL noise removal 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3e597c60

sound/drivers/mts64.c

+1 −1
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ static int __devinit snd_mts64_ctl_create(struct snd_card *card, 
		&mts64_ctl_smpte_time_seconds,

		&mts64_ctl_smpte_time_frames,

		&mts64_ctl_smpte_fps,

	        0  };

	        NULL  };



	for (i = 0; control[i]; ++i) {

		err = snd_ctl_add(card, snd_ctl_new1(control[i], mts));

sound/sparc/dbri.c

+3 −3
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len) 
	else

		printk(KERN_ERR "DBRI: no space for commands.");



	return 0;

	return NULL;

}



/*
@@ -2037,10 +2037,10 @@ static int snd_dbri_open(struct snd_pcm_substream *substream) 
	spin_unlock_irqrestore(&dbri->lock, flags);



	snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_CHANNELS,

			    snd_hw_rule_format, 0, SNDRV_PCM_HW_PARAM_FORMAT,

			    snd_hw_rule_format, NULL, SNDRV_PCM_HW_PARAM_FORMAT,

			    -1);

	snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_FORMAT,

			    snd_hw_rule_channels, 0, 

			    snd_hw_rule_channels, NULL, 

			    SNDRV_PCM_HW_PARAM_CHANNELS,

			    -1);