8 files changed, 29 insertions, 29 deletions

diff --git a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
index f7e374ec441..1b9bf9395cf 100644
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -625,6 +625,8 @@ static short create_adapter_obj(struct hpi_adapter_obj *pao,
                         control_cache_size, (struct hpi_control_cache_info *)
                         &phw->control_cache[0]
                         );
+                if (!phw->p_cache)
+                        pao->has_control_cache = 0;
         } else
                 pao->has_control_cache = 0;
 
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
index 22c5fc62553..2672f6591ce 100644
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -644,6 +644,8 @@ static u16 create_adapter_obj(struct hpi_adapter_obj *pao,
                                 interface->control_cache.size_in_bytes,
                                 (struct hpi_control_cache_info *)
                                 p_control_cache_virtual);
+                        if (!phw->p_cache)
+                                err = HPI_ERROR_MEMORY_ALLOC;
                 }
                 if (!err) {
                         err = hpios_locked_mem_get_phys_addr(&phw->
diff --git a/sound/pci/asihpi/hpicmn.c b/sound/pci/asihpi/hpicmn.c
index dda4f1c6f65..d67f4d3db91 100644
--- a/sound/pci/asihpi/hpicmn.c
+++ b/sound/pci/asihpi/hpicmn.c
@@ -571,14 +571,20 @@ struct hpi_control_cache *hpi_alloc_control_cache(const u32
 {
         struct hpi_control_cache *p_cache =
                 kmalloc(sizeof(*p_cache), GFP_KERNEL);
+        if (!p_cache)
+                return NULL;
+        p_cache->p_info =
+                kmalloc(sizeof(*p_cache->p_info) * number_of_controls,
+                        GFP_KERNEL);
+        if (!p_cache->p_info) {
+                kfree(p_cache);
+                return NULL;
+        }
         p_cache->cache_size_in_bytes = size_in_bytes;
         p_cache->control_count = number_of_controls;
         p_cache->p_cache =
                 (struct hpi_control_cache_single *)pDSP_control_buffer;
         p_cache->init = 0;
-        p_cache->p_info =
-                kmalloc(sizeof(*p_cache->p_info) * p_cache->control_count,
-                GFP_KERNEL);
         return p_cache;
 }
 
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index 3e5ca8fb519..e377287192a 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -225,39 +225,25 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
 {
         struct dsp_spos_instance * ins = kzalloc(sizeof(struct dsp_spos_instance), GFP_KERNEL);
 
-        if (ins == NULL) 
+        if (ins == NULL)
                 return NULL;
 
         /* better to use vmalloc for this big table */
-        ins->symbol_table.nsymbols = 0;
         ins->symbol_table.symbols = vmalloc(sizeof(struct dsp_symbol_entry) *
                                             DSP_MAX_SYMBOLS);
-        ins->symbol_table.highest_frag_index = 0;
-
-        if (ins->symbol_table.symbols == NULL) {
+        ins->code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL);
+        ins->modules = kmalloc(sizeof(struct dsp_module_desc) * DSP_MAX_MODULES, GFP_KERNEL);
+        if (!ins->symbol_table.symbols || !ins->code.data || !ins->modules) {
                 cs46xx_dsp_spos_destroy(chip);
                 goto error;
         }
-
+        ins->symbol_table.nsymbols = 0;
+        ins->symbol_table.highest_frag_index = 0;
         ins->code.offset = 0;
         ins->code.size = 0;
-        ins->code.data = kmalloc(DSP_CODE_BYTE_SIZE, GFP_KERNEL);
-
-        if (ins->code.data == NULL) {
-                cs46xx_dsp_spos_destroy(chip);
-                goto error;
-        }
-
         ins->nscb = 0;
         ins->ntask = 0;
-
         ins->nmodules = 0;
-        ins->modules = kmalloc(sizeof(struct dsp_module_desc) * DSP_MAX_MODULES, GFP_KERNEL);
-
-        if (ins->modules == NULL) {
-                cs46xx_dsp_spos_destroy(chip);
-                goto error;
-        }
 
         /* default SPDIF input sample rate
            to 48000 khz */
@@ -271,8 +257,8 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
 
         /* set left and right validity bits and
            default channel status */
-        ins->spdif_csuv_default = 
-                ins->spdif_csuv_stream =  
+        ins->spdif_csuv_default =
+                ins->spdif_csuv_stream =
          /* byte 0 */  ((unsigned int)_wrap_all_bits(  (SNDRV_PCM_DEFAULT_CON_SPDIF        & 0xff)) << 24) |
          /* byte 1 */  ((unsigned int)_wrap_all_bits( ((SNDRV_PCM_DEFAULT_CON_SPDIF >> 8) & 0xff)) << 16) |
          /* byte 3 */   (unsigned int)_wrap_all_bits(  (SNDRV_PCM_DEFAULT_CON_SPDIF >> 24) & 0xff) |
@@ -281,6 +267,9 @@ struct dsp_spos_instance *cs46xx_dsp_spos_create (struct snd_cs46xx * chip)
         return ins;
 
 error:
+        kfree(ins->modules);
+        kfree(ins->code.data);
+        vfree(ins->symbol_table.symbols);
         kfree(ins);
         return NULL;
 }
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c
index 460fb2ef7e3..18af38ebf75 100644
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
@@ -1166,6 +1166,7 @@ static const char *cs420x_models[CS420X_MODELS] = {
 
 static struct snd_pci_quirk cs420x_cfg_tbl[] = {
         SND_PCI_QUIRK(0x10de, 0x0ac0, "MacBookPro 5,3", CS420X_MBP53),
+        SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55),
         SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
         SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55),
         SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index ef9af3f4ace..1bd7a540fd4 100644
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -425,7 +425,7 @@ exit:
 static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream)
 {
         struct snd_pcm_substream *substream = lx_stream->stream;
-        const int is_capture = lx_stream->is_capture;
+        const unsigned int is_capture = lx_stream->is_capture;
 
         int err;
 
@@ -473,7 +473,7 @@ static void lx_trigger_start(struct lx6464es *chip, struct lx_stream *lx_stream)
 
 static void lx_trigger_stop(struct lx6464es *chip, struct lx_stream *lx_stream)
 {
-        const int is_capture = lx_stream->is_capture;
+        const unsigned int is_capture = lx_stream->is_capture;
         int err;
 
         snd_printd(LXP "stopping: stopping stream\n");
diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h
index 51afc048961..aea621eafbb 100644
--- a/sound/pci/lx6464es/lx6464es.h
+++ b/sound/pci/lx6464es/lx6464es.h
@@ -60,7 +60,7 @@ struct lx_stream {
         snd_pcm_uframes_t          frame_pos;
         enum lx_stream_status      status; /* free, open, running, draining
                                             * pause */
-        int                        is_capture:1;
+        unsigned int               is_capture:1;
 };
 
 
diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c
index 3086b751da4..617f98b0cba 100644
--- a/sound/pci/lx6464es/lx_core.c
+++ b/sound/pci/lx6464es/lx_core.c
@@ -1152,7 +1152,7 @@ static int lx_interrupt_request_new_buffer(struct lx6464es *chip,
                                            struct lx_stream *lx_stream)
 {
         struct snd_pcm_substream *substream = lx_stream->stream;
-        int is_capture = lx_stream->is_capture;
+        const unsigned int is_capture = lx_stream->is_capture;
         int err;
         unsigned long flags;