Patchwork ALSA: snd-aoa: two copy and paste bugs

login
register
mail settings
Submitter Dan Carpenter
Date Nov. 13, 2013, 7:45 a.m.
Message ID <20131113074520.GD25541@elgon.mountain>
Download mbox | patch
Permalink /patch/290852/
State Not Applicable
Headers show

Comments

Dan Carpenter - Nov. 13, 2013, 7:45 a.m.
These functions were cut and paste and the tests for NULL weren't
updated properly.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Takashi Iwai - Nov. 13, 2013, 8:29 a.m.
At Wed, 13 Nov 2013 10:45:20 +0300,
Dan Carpenter wrote:
> 
> These functions were cut and paste and the tests for NULL weren't
> updated properly.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks, applied.


Takashi

> 
> diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
> index 61ab640..9dc5806 100644
> --- a/sound/aoa/fabrics/layout.c
> +++ b/sound/aoa/fabrics/layout.c
> @@ -644,7 +644,7 @@ static int n##_control_put(struct snd_kcontrol *kcontrol,		\
>  			   struct snd_ctl_elem_value *ucontrol)		\
>  {									\
>  	struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);	\
> -	if (gpio->methods && gpio->methods->get_##n)			\
> +	if (gpio->methods && gpio->methods->set_##n)			\
>  		gpio->methods->set_##n(gpio,				\
>  			!!ucontrol->value.integer.value[0]);		\
>  	return 1;							\
> @@ -1135,7 +1135,7 @@ static int aoa_fabric_layout_resume(struct soundbus_dev *sdev)
>  {
>  	struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);
>  
> -	if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
> +	if (ldev->gpio.methods && ldev->gpio.methods->all_amps_restore)
>  		ldev->gpio.methods->all_amps_restore(&ldev->gpio);
>  
>  	return 0;
>
Johannes Berg - Nov. 13, 2013, 8:29 a.m.
On Wed, 2013-11-13 at 09:29 +0100, Takashi Iwai wrote:
> At Wed, 13 Nov 2013 10:45:20 +0300,
> Dan Carpenter wrote:
> > 
> > These functions were cut and paste and the tests for NULL weren't
> > updated properly.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Thanks, applied.

FWIW, looks fine to me - I wonder how long this has been broken though,
must be practically forever. I guess we never got it wrong and missed
adding some pointers? :-)

johannes

Patch

diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index 61ab640..9dc5806 100644
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -644,7 +644,7 @@  static int n##_control_put(struct snd_kcontrol *kcontrol,		\
 			   struct snd_ctl_elem_value *ucontrol)		\
 {									\
 	struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol);	\
-	if (gpio->methods && gpio->methods->get_##n)			\
+	if (gpio->methods && gpio->methods->set_##n)			\
 		gpio->methods->set_##n(gpio,				\
 			!!ucontrol->value.integer.value[0]);		\
 	return 1;							\
@@ -1135,7 +1135,7 @@  static int aoa_fabric_layout_resume(struct soundbus_dev *sdev)
 {
 	struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev);
 
-	if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off)
+	if (ldev->gpio.methods && ldev->gpio.methods->all_amps_restore)
 		ldev->gpio.methods->all_amps_restore(&ldev->gpio);
 
 	return 0;