diff options
author | Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | 2010-08-26 11:07:23 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-27 06:23:27 -0400 |
commit | e4b6b74ffd32d114227a5dcfe814e2cecd80554b (patch) | |
tree | 4db9ddd774de46c19fa0035928625e6e901b7747 | |
parent | fbd60ce79170d4060127718df23bc13a270c7d95 (diff) |
ARM: S3C64XX: Fix fallthrough bug in i2sv3 gpio configuration, improve logging
If the platform device id is 1, the code will fallthrough the
case and incorrectly return -EINVAL. Add a break to avoid fallthrough.
Make logging slightly more verbose by including the device id.
This fixes an issue only present in multi-component.
Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | arch/arm/mach-s3c64xx/dev-audio.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c index f0942585b9c..3838335f125 100644 --- a/arch/arm/mach-s3c64xx/dev-audio.c +++ b/arch/arm/mach-s3c64xx/dev-audio.c | |||
@@ -43,8 +43,10 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev) | |||
43 | s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK); | 43 | s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK); |
44 | s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI); | 44 | s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI); |
45 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0); | 45 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0); |
46 | break; | ||
46 | default: | 47 | default: |
47 | printk(KERN_DEBUG "Invalid I2S Controller number!"); | 48 | printk(KERN_DEBUG "Invalid I2S Controller number: %d\n", |
49 | pdev->id); | ||
48 | return -EINVAL; | 50 | return -EINVAL; |
49 | } | 51 | } |
50 | 52 | ||
@@ -184,7 +186,8 @@ static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) | |||
184 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); | 186 | s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT); |
185 | break; | 187 | break; |
186 | default: | 188 | default: |
187 | printk(KERN_DEBUG "Invalid PCM Controller number!"); | 189 | printk(KERN_DEBUG "Invalid PCM Controller number: %d\n", |
190 | pdev->id); | ||
188 | return -EINVAL; | 191 | return -EINVAL; |
189 | } | 192 | } |
190 | 193 | ||