mach:-s3c64xx:Cause kernel oops with WARN_ON if calls for setting up gpio fail in s3c64xx_i2s_cfg_gpio
Subsystems (3)
PATCH RESEND 1/1 mach:-s3c64xx:Cause kernel oops with WARN_ON if calls for setting up gpio fail in s3c64xx_i2s_cfg_gpio
This fixes the function s3c64xx_i2c_cfg_gpio to cause a kernel oopes if the call to either s3c_gpio_cfgpin_range or s3c_gpio_cfgpin fail as we cannot continue to run on a board using this gpio setup if the configuration for the board fails when the gpio configuration of the board is being reconfigured in the function in s3c64xx_i2s_cfg_gpio.
--- arch/arm/mach-s3c64xx/dev-audio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-s3c64xx/dev-audio.c +5 -5
@@ -36,10 +36,10 @@ static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) base =S3C64XX_GPE (0 );break ;case 2 : -s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin_range (S3C64XX_GPH (6 ),4 ,S3C_GPIO_SFN (5 )); +WARN_ON (s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C_GPIO_SFN (5 ))); +WARN_ON (s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C_GPIO_SFN (5 ))); +WARN_ON (s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C_GPIO_SFN (5 ))); + WARN_ON(s3c_gpio_cfgpin_range(S3C64XX_GPH(6), 4, S3C_GPIO_SFN(5));)return 0 ;default : printk(KERN_DEBUG "Invalid I2S Controller number: %d\n",
@@ -47,7 +47,7 @@ static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev)return -EINVAL ; } -s3c_gpio_cfgpin_range (base,5 ,S3C_GPIO_SFN (3 )); +WARN_ON (s3c_gpio_cfgpin_range (base,5 ,S3C_GPIO_SFN (3 )));return 0 ; }
Signature · 1 line
2.1.4
Quoted 1 line · Nicholas Krause
This fixes the function
s3c64xx_i2c_cfg_gpio
The problem is not described and you did not provide a fix so the description is highly inaccurate and misleading.
Quoted 1 line
to cause a kernel oopes
Warn causes oops?
Quoted 2 lines
if the call to either
s3c_gpio_cfgpin_rangeors3c_gpio_cfgpinfail as we cannot continue to run
"cannot continue to run" means BUG_ON?
Quoted 4 lines
on a board using this gpio setup if
the configuration for the board fails when the gpio configuration of the board is being reconfigured in the function ins3c64xx_i2s_cfg_gpio.
Please rephrase. You essentially said "Configuration fails when configuration is being reconfigured". Too many configurations...
Fix the subject as well.
Best regards,
Krzysztof
Quoted 35 lines
Signed-off-by Nicholas Krause <[email protected]>--- arch/arm/mach-s3c64xx/dev-audio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)arch/arm/mach-s3c64xx/dev-audio.c +5
-5@@ -36,10 +36,10 @@ static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev) base =S3C64XX_GPE (0 );break ;case 2 : -s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C_GPIO_SFN (5 )); -s3c_gpio_cfgpin_range (S3C64XX_GPH (6 ),4 ,S3C_GPIO_SFN (5 )); +WARN_ON (s3c_gpio_cfgpin (S3C64XX_GPC (4 ),S3C_GPIO_SFN (5 ))); +WARN_ON (s3c_gpio_cfgpin (S3C64XX_GPC (5 ),S3C_GPIO_SFN (5 ))); +WARN_ON (s3c_gpio_cfgpin (S3C64XX_GPC (7 ),S3C_GPIO_SFN (5 ))); + WARN_ON(s3c_gpio_cfgpin_range(S3C64XX_GPH(6), 4, S3C_GPIO_SFN(5));)return 0 ;default : printk(KERN_DEBUG "Invalid I2S Controller number: %d\n",@@ -47,7 +47,7 @@ static int s3c64xx_i2s_cfg_gpio(struct platform_device *pdev)return -EINVAL ; } -s3c_gpio_cfgpin_range (base,5 ,S3C_GPIO_SFN (3 )); +WARN_ON (s3c_gpio_cfgpin_range (base,5 ,S3C_GPIO_SFN (3 )));return 0 ; }