diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-05-02 08:24:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-05-02 08:24:42 +0200 |
| commit | d7dc450d5a7162de96edbed6b1792240c2f3a55f (patch) | |
| tree | d6dc2d26b393dd69881cd4b9498718f65b35abeb /sound/pci/ali5451/ali5451.c | |
| parent | d4a2fbcee0c8449ce24d6de168f3d90c5e6d7596 (diff) | |
| parent | 0997e378be1d888a5d093eeee55f842cdfe55ebe (diff) | |
Merge branch 'for-next' into for-linus
For 4.12 merge.
Diffstat (limited to 'sound/pci/ali5451/ali5451.c')
| -rw-r--r-- | sound/pci/ali5451/ali5451.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c index 92b819e4f729..34bbc2e730a6 100644 --- a/sound/pci/ali5451/ali5451.c +++ b/sound/pci/ali5451/ali5451.c @@ -1339,7 +1339,7 @@ static int snd_ali_prepare(struct snd_pcm_substream *substream) rate = snd_ali_get_spdif_in_rate(codec); if (rate == 0) { dev_warn(codec->card->dev, - "ali_capture_preapre: spdif rate detect err!\n"); + "ali_capture_prepare: spdif rate detect err!\n"); rate = 48000; } spin_lock_irq(&codec->reg_lock); |