diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 17:36:07 +0000 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-11-13 17:36:07 +0000 |
| commit | 6097a07411005c0184cf90256743c784079198fc (patch) | |
| tree | 0c6496aa7de5f00a60ed8e7bac4b34f5acc7e30a /sound/soc/codecs/cs42l52.c | |
| parent | 6a872777ffff6184f4ac10bd71d926d5e6f2491e (diff) | |
| parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
| download | blackbird-op-linux-6097a07411005c0184cf90256743c784079198fc.tar.gz blackbird-op-linux-6097a07411005c0184cf90256743c784079198fc.zip | |
Merge tag 'v3.7-rc5' into execve
Linux 3.7-rc5
Conflicts:
arch/arm64/kernel/process.c
Diffstat (limited to 'sound/soc/codecs/cs42l52.c')
| -rw-r--r-- | sound/soc/codecs/cs42l52.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/cs42l52.c b/sound/soc/codecs/cs42l52.c index 61599298fb26..4d8db3685e96 100644 --- a/sound/soc/codecs/cs42l52.c +++ b/sound/soc/codecs/cs42l52.c @@ -763,7 +763,7 @@ static int cs42l52_set_sysclk(struct snd_soc_dai *codec_dai, if ((freq >= CS42L52_MIN_CLK) && (freq <= CS42L52_MAX_CLK)) { cs42l52->sysclk = freq; } else { - dev_err(codec->dev, "Invalid freq paramter\n"); + dev_err(codec->dev, "Invalid freq parameter\n"); return -EINVAL; } return 0; |
