From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 7 Feb 2013 11:34:36 +0000 (+0100)
Subject: Merge branch 'topic/hda-ca0132-dsp' into for-next
X-Git-Tag: v3.9-rc1~52^2~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45acc86b2e47e255c4a6194dd69248a1bce71e48;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'topic/hda-ca0132-dsp' into for-next
---

45acc86b2e47e255c4a6194dd69248a1bce71e48
diff --cc sound/pci/hda/hda_intel.c
index d9e37ff,99e61b9..4b099c6
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -1481,11 -1441,12 +1490,12 @@@ static int azx_setup_periods(struct az
  				pos_align;
  		pos_adj = frames_to_bytes(runtime, pos_adj);
  		if (pos_adj >= period_bytes) {
 -			snd_printk(KERN_WARNING SFX "Too big adjustment %d\n",
 -				   bdl_pos_adj[chip->dev_index]);
 +			snd_printk(KERN_WARNING SFX "%s: Too big adjustment %d\n",
 +				   pci_name(chip->pci), bdl_pos_adj[chip->dev_index]);
  			pos_adj = 0;
  		} else {
- 			ofs = setup_bdle(chip, substream, azx_dev,
+ 			ofs = setup_bdle(chip, snd_pcm_get_dma_buf(substream),
+ 					 azx_dev,
  					 &bdl, ofs, pos_adj, true);
  			if (ofs < 0)
  				goto error;