diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 3 | ||||
-rw-r--r-- | sound/soc/omap/omap-pcm.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 71d3a773e94b..35b83dc6e19e 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -841,6 +841,7 @@ static struct hda_verb stac92hd83xxx_core_init[] = { | |||
841 | 841 | ||
842 | /* power state controls amps */ | 842 | /* power state controls amps */ |
843 | { 0x01, AC_VERB_SET_EAPD, 1 << 2}, | 843 | { 0x01, AC_VERB_SET_EAPD, 1 << 2}, |
844 | {} | ||
844 | }; | 845 | }; |
845 | 846 | ||
846 | static struct hda_verb stac92hd71bxx_core_init[] = { | 847 | static struct hda_verb stac92hd71bxx_core_init[] = { |
@@ -850,6 +851,7 @@ static struct hda_verb stac92hd71bxx_core_init[] = { | |||
850 | { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 851 | { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
851 | { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 852 | { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
852 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | 853 | { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, |
854 | {} | ||
853 | }; | 855 | }; |
854 | 856 | ||
855 | #define HD_DISABLE_PORTF 2 | 857 | #define HD_DISABLE_PORTF 2 |
@@ -1681,6 +1683,7 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { | |||
1681 | /* SigmaTel reference board */ | 1683 | /* SigmaTel reference board */ |
1682 | SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, | 1684 | SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668, |
1683 | "DFI LanParty", STAC_92HD71BXX_REF), | 1685 | "DFI LanParty", STAC_92HD71BXX_REF), |
1686 | {} /* terminator */ | ||
1684 | }; | 1687 | }; |
1685 | 1688 | ||
1686 | static unsigned int ref92hd71bxx_pin_configs[11] = { | 1689 | static unsigned int ref92hd71bxx_pin_configs[11] = { |
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index e9084fdd2082..acd68efb2b75 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c | |||
@@ -233,7 +233,7 @@ static int omap_pcm_open(struct snd_pcm_substream *substream) | |||
233 | if (ret < 0) | 233 | if (ret < 0) |
234 | goto out; | 234 | goto out; |
235 | 235 | ||
236 | prtd = kzalloc(sizeof(prtd), GFP_KERNEL); | 236 | prtd = kzalloc(sizeof(*prtd), GFP_KERNEL); |
237 | if (prtd == NULL) { | 237 | if (prtd == NULL) { |
238 | ret = -ENOMEM; | 238 | ret = -ENOMEM; |
239 | goto out; | 239 | goto out; |