Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4b6b74f authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by Mark Brown
Browse files

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: default avatarDimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent fbd60ce7

arch/arm/mach-s3c64xx/dev-audio.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -43,8 +43,10 @@ static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev) 
		s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK);

		s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C64XX_GPE2_I2S1_LRCLK);

		s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI);

		s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C64XX_GPE3_I2S1_DI);

		s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0);

		s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_I2S1_D0);

		break;

	default:

	default:

		printk(KERN_DEBUG "Invalid I2S Controller number!");

		printk(KERN_DEBUG "Invalid I2S Controller number: %d\n",

			pdev->id);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -184,7 +186,8 @@ static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev) 
		s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT);

		s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C64XX_GPE4_PCM1_SOUT);

		break;

		break;

	default:

	default:

		printk(KERN_DEBUG "Invalid PCM Controller number!");

		printk(KERN_DEBUG "Invalid PCM Controller number: %d\n",

			pdev->id);

		return -EINVAL;

		return -EINVAL;

	}

	}