summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-24 23:42:57 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-24 15:55:03 -0700
commitae97dd9af17f0c7f5142b46c4289623176c477f3 (patch)
treedcefebf4942b8a9fe02cf33f5b3d5ffc7503175a /sound
parent3e597c6045502dd0fa98a61aa95ba178f8a2cc03 (diff)
downloadlinux-3.10-ae97dd9af17f0c7f5142b46c4289623176c477f3.tar.gz
linux-3.10-ae97dd9af17f0c7f5142b46c4289623176c477f3.tar.bz2
linux-3.10-ae97dd9af17f0c7f5142b46c4289623176c477f3.zip
[PATCH] NULL noise removal
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/drivers/mts64.c2
-rw-r--r--sound/sparc/dbri.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 169987302ae..ab8d4effcf9 100644
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -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));
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index e4935fca12d..8016541ec16 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -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);