Merge branch 'fix/hda' into topic/hda

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[] = {
 
         /* power state controls amps */
         { 0x01, AC_VERB_SET_EAPD, 1 << 2},
+        {}
 };
 
 static struct hda_verb stac92hd71bxx_core_init[] = {
@@ -850,6 +851,7 @@ static struct hda_verb stac92hd71bxx_core_init[] = {
         { 0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         { 0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {}
 };
 
 #define HD_DISABLE_PORTF 2
@@ -1681,6 +1683,7 @@ static struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = {
         /* SigmaTel reference board */
         SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x2668,
                       "DFI LanParty", STAC_92HD71BXX_REF),
+        {} /* terminator */
 };
 
 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)
         if (ret < 0)
                 goto out;
 
-        prtd = kzalloc(sizeof(prtd), GFP_KERNEL);
+        prtd = kzalloc(sizeof(*prtd), GFP_KERNEL);
         if (prtd == NULL) {
                 ret = -ENOMEM;
                 goto out;