From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: Mark Brown <broonie@kernel.org>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
alsa-devel@alsa-project.org, Liam Girdwood <lgirdwood@gmail.com>
Subject: Re: [PATCH 1/2] ASoC: Intel: Fix Baytrail SST DSP firmware loading
Date: Wed, 14 May 2014 09:18:14 +0300 [thread overview]
Message-ID: <53730AA6.5060300@linux.intel.com> (raw)
In-Reply-To: <20140513172604.GM12304@sirena.org.uk>
On 05/13/2014 08:26 PM, Mark Brown wrote:
> On Fri, May 09, 2014 at 04:47:43PM +0300, Jarkko Nikula wrote:
>
>> - ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
>> + ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32));
>> if (ret)
>> return ret;
> My resolution of the merge of your revised version and topic/intel looks
> like this so I *think* it's OK but please check that I did the right
> thing.
Thanks, it's ok! And sorry the mess, I was somehow blind to see Liam's
patch being 3.15 material. Hurry to weekend I guess.
--
Jarkko
prev parent reply other threads:[~2014-05-14 6:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 13:47 [PATCH 1/2] ASoC: Intel: Fix Baytrail SST DSP firmware loading Jarkko Nikula
2014-05-09 13:47 ` [PATCH 2/2] ASoC: Intel: Use ACPI device for Baytrail PCM buffer allocation Jarkko Nikula
2014-05-12 22:10 ` Mark Brown
2014-05-13 7:30 ` Jarkko Nikula
2014-05-13 10:54 ` Mark Brown
2014-05-12 22:09 ` [PATCH 1/2] ASoC: Intel: Fix Baytrail SST DSP firmware loading Mark Brown
2014-05-13 7:22 ` Jarkko Nikula
2014-05-13 10:53 ` Mark Brown
2014-05-13 12:46 ` [PATCHv2] " Jarkko Nikula
2014-05-13 17:21 ` Mark Brown
2014-05-13 17:26 ` [PATCH 1/2] " Mark Brown
2014-05-14 6:18 ` Jarkko Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53730AA6.5060300@linux.intel.com \
--to=jarkko.nikula@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=liam.r.girdwood@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox