aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
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 169987302ae4..ab8d4effcf9e 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,
677 &mts64_ctl_smpte_time_seconds, 677 &mts64_ctl_smpte_time_seconds,
678 &mts64_ctl_smpte_time_frames, 678 &mts64_ctl_smpte_time_frames,
679 &mts64_ctl_smpte_fps, 679 &mts64_ctl_smpte_fps,
680 0 }; 680 NULL };
681 681
682 for (i = 0; control[i]; ++i) { 682 for (i = 0; control[i]; ++i) {
683 err = snd_ctl_add(card, snd_ctl_new1(control[i], mts)); 683 err = snd_ctl_add(card, snd_ctl_new1(control[i], mts));
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