diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2013-11-13 02:45:20 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-11-13 03:28:23 -0500 |
commit | 11b3fdacbac0df6a3531e2b63c876e8442cea2a8 (patch) | |
tree | d56ea64e3f22973b7868f7366915e55e4fbcf773 | |
parent | 468ac413045af1e0e4d1272291bed6878f248a69 (diff) |
ALSA: snd-aoa: two copy and paste bugs
These functions were cut and paste and the tests for NULL weren't
updated properly.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/aoa/fabrics/layout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index 61ab640e195f..9dc5806d23dd 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, \ | |||
644 | struct snd_ctl_elem_value *ucontrol) \ | 644 | struct snd_ctl_elem_value *ucontrol) \ |
645 | { \ | 645 | { \ |
646 | struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol); \ | 646 | struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol); \ |
647 | if (gpio->methods && gpio->methods->get_##n) \ | 647 | if (gpio->methods && gpio->methods->set_##n) \ |
648 | gpio->methods->set_##n(gpio, \ | 648 | gpio->methods->set_##n(gpio, \ |
649 | !!ucontrol->value.integer.value[0]); \ | 649 | !!ucontrol->value.integer.value[0]); \ |
650 | return 1; \ | 650 | return 1; \ |
@@ -1135,7 +1135,7 @@ static int aoa_fabric_layout_resume(struct soundbus_dev *sdev) | |||
1135 | { | 1135 | { |
1136 | struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); | 1136 | struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); |
1137 | 1137 | ||
1138 | if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) | 1138 | if (ldev->gpio.methods && ldev->gpio.methods->all_amps_restore) |
1139 | ldev->gpio.methods->all_amps_restore(&ldev->gpio); | 1139 | ldev->gpio.methods->all_amps_restore(&ldev->gpio); |
1140 | 1140 | ||
1141 | return 0; | 1141 | return 0; |