Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: ice1724 - aureon - modify WM8770 Master & DAC volume
  ALSA: hda/realtek: quirk for D945GCLF2 mainboard
  ALSA: hda - Terradici HDA controllers does not support 64-bit mode
  ALSA: document: Add direct git link to grub hda-analyzer
  ALSA: radio/sound/miro: fix build, cleanup depends/selects
  ALSA: hda - Generalize EAPD inversion check in patch_analog.c
  ASoC: Wrong variable returned on error
  ALSA: snd-usb-us122l: add product IDs of US-122MKII and US-144MKII
  ALSA: hda - Exclude unusable ADCs for ALC88x
  ALSA: hda - Add missing Line-Out and PCM switches as slave
  ALSA: hda - iMac 9,1 sound patch.
  ALSA: opti93x: set MC indirect registers base from PnP data

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/soc/imx/mx1_mx2-pcm.c b/sound/soc/imx/mx1_mx2-pcm.c
index b83866529397..bffffcd5ff34 100644
--- a/sound/soc/imx/mx1_mx2-pcm.c
+++ b/sound/soc/imx/mx1_mx2-pcm.c
@@ -322,12 +322,12 @@ static int mx1_mx2_pcm_open(struct snd_pcm_substream *substream)
 
         pr_debug("%s: Requesting dma channel (%s)\n", __func__,
                                                 prtd->dma_params->name);
-        prtd->dma_ch = imx_dma_request_by_prio(prtd->dma_params->name,
-                                                DMA_PRIO_HIGH);
-        if (prtd->dma_ch < 0) {
+        ret = imx_dma_request_by_prio(prtd->dma_params->name, DMA_PRIO_HIGH);
+        if (ret < 0) {
                 printk(KERN_ERR "Error %d requesting dma channel\n", ret);
                 return ret;
         }
+        prtd->dma_ch = ret;
         imx_dma_config_burstlen(prtd->dma_ch,
                                 prtd->dma_params->watermark_level);