aboutsummaryrefslogtreecommitdiffstats
path: root/sound/sparc/dbri.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-24 18:42:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-24 18:55:03 -0400
commitae97dd9af17f0c7f5142b46c4289623176c477f3 (patch)
treedcefebf4942b8a9fe02cf33f5b3d5ffc7503175a /sound/sparc/dbri.c
parent3e597c6045502dd0fa98a61aa95ba178f8a2cc03 (diff)
[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/sparc/dbri.c')
-rw-r--r--sound/sparc/dbri.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index e4935fca12df..8016541ec16d 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)
669 else 669 else
670 printk(KERN_ERR "DBRI: no space for commands."); 670 printk(KERN_ERR "DBRI: no space for commands.");
671 671
672 return 0; 672 return NULL;
673} 673}
674 674
675/* 675/*
@@ -2037,10 +2037,10 @@ static int snd_dbri_open(struct snd_pcm_substream *substream)
2037 spin_unlock_irqrestore(&dbri->lock, flags); 2037 spin_unlock_irqrestore(&dbri->lock, flags);
2038 2038
2039 snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_CHANNELS, 2039 snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_CHANNELS,
2040 snd_hw_rule_format, 0, SNDRV_PCM_HW_PARAM_FORMAT, 2040 snd_hw_rule_format, NULL, SNDRV_PCM_HW_PARAM_FORMAT,
2041 -1); 2041 -1);
2042 snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_FORMAT, 2042 snd_pcm_hw_rule_add(runtime,0,SNDRV_PCM_HW_PARAM_FORMAT,
2043 snd_hw_rule_channels, 0, 2043 snd_hw_rule_channels, NULL,
2044 SNDRV_PCM_HW_PARAM_CHANNELS, 2044 SNDRV_PCM_HW_PARAM_CHANNELS,
2045 -1); 2045 -1);
2046 2046