3 files changed, 30 insertions, 18 deletions

diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index 2c7e25336795..0e06c6c9fcc0 100644
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -464,7 +464,8 @@ static int pcxhr_update_r_buffer(struct pcxhr_stream *stream)
         pcxhr_init_rmh(&rmh, CMD_UPDATE_R_BUFFERS);
         pcxhr_set_pipe_cmd_params(&rmh, is_capture, stream->pipe->first_audio, stream_num, 0);
 
-        snd_assert(subs->runtime->dma_bytes < 0x200000);        /* max buffer size is 2 MByte */
+        /* max buffer size is 2 MByte */
+        snd_BUG_ON(subs->runtime->dma_bytes >= 0x200000);
         rmh.cmd[1] = subs->runtime->dma_bytes * 8;              /* size in bits */
         rmh.cmd[2] = subs->runtime->dma_addr >> 24;             /* most significant byte */
         rmh.cmd[2] |= 1<<19;                                    /* this is a circular buffer */
@@ -1228,7 +1229,8 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id
                 return -ENOMEM;
         }
 
-        snd_assert(pci_id->driver_data < PCI_ID_LAST, return -ENODEV);
+        if (snd_BUG_ON(pci_id->driver_data >= PCI_ID_LAST))
+                return -ENODEV;
         card_name = pcxhr_board_params[pci_id->driver_data].board_name;
         mgr->playback_chips = pcxhr_board_params[pci_id->driver_data].playback_chips;
         mgr->capture_chips  = pcxhr_board_params[pci_id->driver_data].capture_chips;
diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c
index 000e6fed6e39..7143259cfe34 100644
--- a/sound/pci/pcxhr/pcxhr_core.c
+++ b/sound/pci/pcxhr/pcxhr_core.c
@@ -319,16 +319,20 @@ static int pcxhr_download_dsp(struct pcxhr_mgr *mgr, const struct firmware *dsp)
         const unsigned char *data;
         unsigned char dummy;
         /* check the length of boot image */
-        snd_assert(dsp->size > 0, return -EINVAL);
-        snd_assert(dsp->size % 3 == 0, return -EINVAL);
-        snd_assert(dsp->data, return -EINVAL);
+        if (dsp->size <= 0)
+                return -EINVAL;
+        if (dsp->size % 3)
+                return -EINVAL;
+        if (snd_BUG_ON(!dsp->data))
+                return -EINVAL;
         /* transfert data buffer from PC to DSP */
         for (i = 0; i < dsp->size; i += 3) {
                 data = dsp->data + i;
                 if (i == 0) {
                         /* test data header consistency */
                         len = (unsigned int)((data[0]<<16) + (data[1]<<8) + data[2]);
-                        snd_assert((len==0) || (dsp->size == (len+2)*3), return -EINVAL);
+                        if (len && dsp->size != (len + 2) * 3)
+                                return -EINVAL;
                 }
                 /* wait DSP ready for new transfer */
                 err = pcxhr_check_reg_bit(mgr, PCXHR_DSP_ISR, PCXHR_ISR_HI08_TRDY,
@@ -389,7 +393,8 @@ int pcxhr_load_boot_binary(struct pcxhr_mgr *mgr, const struct firmware *boot)
         unsigned char dummy;
 
         /* send the hostport address to the DSP (only the upper 24 bit !) */
-        snd_assert((physaddr & 0xff) == 0, return -EINVAL);
+        if (snd_BUG_ON(physaddr & 0xff))
+                return -EINVAL;
         PCXHR_OUTPL(mgr, PCXHR_PLX_MBOX1, (physaddr >> 8));
 
         err = pcxhr_send_it_dsp(mgr, PCXHR_IT_DOWNLOAD_BOOT, 0);
@@ -570,7 +575,8 @@ static int pcxhr_send_msg_nolock(struct pcxhr_mgr *mgr, struct pcxhr_rmh *rmh)
         u32 data;
         unsigned char reg;
 
-        snd_assert(rmh->cmd_len<PCXHR_SIZE_MAX_CMD, return -EINVAL);
+        if (snd_BUG_ON(rmh->cmd_len >= PCXHR_SIZE_MAX_CMD))
+                return -EINVAL;
         err = pcxhr_send_it_dsp(mgr, PCXHR_IT_MESSAGE, 1);
         if (err) {
                 snd_printk(KERN_ERR "pcxhr_send_message : ED_DSP_CRASHED\n");
@@ -677,7 +683,8 @@ static int pcxhr_send_msg_nolock(struct pcxhr_mgr *mgr, struct pcxhr_rmh *rmh)
  */
 void pcxhr_init_rmh(struct pcxhr_rmh *rmh, int cmd)
 {
-        snd_assert(cmd < CMD_LAST_INDEX, return);
+        if (snd_BUG_ON(cmd >= CMD_LAST_INDEX))
+                return;
         rmh->cmd[0] = pcxhr_dsp_cmds[cmd].opcode;
         rmh->cmd_len = 1;
         rmh->stat_len = pcxhr_dsp_cmds[cmd].st_length;
@@ -690,17 +697,17 @@ void pcxhr_set_pipe_cmd_params(struct pcxhr_rmh *rmh, int capture,
                                unsigned int param1, unsigned int param2,
                                unsigned int param3)
 {
-        snd_assert(param1 <= MASK_FIRST_FIELD);
+        snd_BUG_ON(param1 > MASK_FIRST_FIELD);
         if (capture)
                 rmh->cmd[0] |= 0x800;           /* COMMAND_RECORD_MASK */
         if (param1)
                 rmh->cmd[0] |= (param1 << FIELD_SIZE);
         if (param2) {
-                snd_assert(param2 <= MASK_FIRST_FIELD);
+                snd_BUG_ON(param2 > MASK_FIRST_FIELD);
                 rmh->cmd[0] |= param2;
         }
         if(param3) {
-                snd_assert(param3 <= MASK_DSP_WORD);
+                snd_BUG_ON(param3 > MASK_DSP_WORD);
                 rmh->cmd[1] = param3;
                 rmh->cmd_len = 2;
         }
diff --git a/sound/pci/pcxhr/pcxhr_hwdep.c b/sound/pci/pcxhr/pcxhr_hwdep.c
index d2f043278cf4..96640d9c227d 100644
--- a/sound/pci/pcxhr/pcxhr_hwdep.c
+++ b/sound/pci/pcxhr/pcxhr_hwdep.c
@@ -65,15 +65,18 @@ static int pcxhr_init_board(struct pcxhr_mgr *mgr)
         if (err)
                 return err;
         /* test 8 or 12 phys out */
-        snd_assert((rmh.stat[0] & MASK_FIRST_FIELD) == mgr->playback_chips*2,
-                   return -EINVAL);
+        if ((rmh.stat[0] & MASK_FIRST_FIELD) != mgr->playback_chips * 2)
+                return -EINVAL;
         /* test 8 or 2 phys in */
-        snd_assert(((rmh.stat[0] >> (2*FIELD_SIZE)) & MASK_FIRST_FIELD) ==
-                   mgr->capture_chips * 2, return -EINVAL);
+        if (((rmh.stat[0] >> (2 * FIELD_SIZE)) & MASK_FIRST_FIELD) !=
+            mgr->capture_chips * 2)
+                return -EINVAL;
         /* test max nb substream per board */
-        snd_assert((rmh.stat[1] & 0x5F) >= card_streams, return -EINVAL);
+        if ((rmh.stat[1] & 0x5F) < card_streams)
+                return -EINVAL;
         /* test max nb substream per pipe */
-        snd_assert(((rmh.stat[1]>>7)&0x5F) >= PCXHR_PLAYBACK_STREAMS, return -EINVAL);
+        if (((rmh.stat[1] >> 7) & 0x5F) < PCXHR_PLAYBACK_STREAMS)
+                return -EINVAL;
 
         pcxhr_init_rmh(&rmh, CMD_VERSION);
         /* firmware num for DSP */