hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dan Carpenter 2013-11-13 10:45:20 +03:00 committed by Takashi Iwai
parent 468ac41304
commit 11b3fdacba
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/aoa/fabrics/layout.c
View File

@ -644,7 +644,7 @@ static int n##_control_put(struct snd_kcontrol *kcontrol, \
struct snd_ctl_elem_value *ucontrol) \ struct snd_ctl_elem_value *ucontrol) \
{ \ { \
struct gpio_runtime *gpio = snd_kcontrol_chip(kcontrol); \ 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, \ gpio->methods->set_##n(gpio, \
!!ucontrol->value.integer.value[0]); \ !!ucontrol->value.integer.value[0]); \
return 1; \ 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); 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); ldev->gpio.methods->all_amps_restore(&ldev->gpio);
return 0; return 0;