X-Git-Url: http://nv-tegra.nvidia.com/gitweb/?p=linux-2.6.git;a=blobdiff_plain;f=sound%2Fsparc%2Fdbri.c;h=8016541ec16d7d766a1e035b061a7038dd95cd87;hp=e4935fca12dff57c88b3417ea154eb80cacbfe54;hb=ae97dd9af17f0c7f5142b46c4289623176c477f3;hpb=3e597c6045502dd0fa98a61aa95ba178f8a2cc03 diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index e4935fc..8016541 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);