From: Mark Brown <broonie@kernel.org>
Date: Mon, 8 Dec 2014 13:11:48 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic... 
X-Git-Tag: v3.19-rc1~119^2~20^2~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4aad340f1b1930d42b3be25e0013fe7d7976f5be;p=~emulex%2Finfiniband.git

Merge remote-tracking branches 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4535', 'asoc/topic/ak4641' and 'asoc/topic/ak4642' into asoc-next
---

4aad340f1b1930d42b3be25e0013fe7d7976f5be
diff --cc sound/soc/codecs/wm_adsp.c
index cce9020933c,f412a9911a7,6a2a0357097,f412a9911a7,f412a9911a7,f412a9911a7..720d6e85298
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@@@@@@ -684,38 -684,38 -686,24 -684,38 -684,38 -684,38 +686,24 @@@@@@@ static int wm_adsp_load(struct wm_adsp 
      		}
      
      		if (reg) {
-- ---			size_t to_write = PAGE_SIZE;
-- ---			size_t remain = le32_to_cpu(region->len);
-- ---			const u8 *data = region->data;
-- ---
-- ---			while (remain > 0) {
-- ---				if (remain < PAGE_SIZE)
-- ---					to_write = remain;
-- ---
-- ---				buf = wm_adsp_buf_alloc(data,
-- ---							to_write,
-- ---							&buf_list);
-- ---				if (!buf) {
-- ---					adsp_err(dsp, "Out of memory\n");
-- ---					ret = -ENOMEM;
-- ---					goto out_fw;
-- ---				}
-- ---
-- ---				ret = regmap_raw_write_async(regmap, reg,
-- ---							     buf->buf,
-- ---							     to_write);
-- ---				if (ret != 0) {
-- ---					adsp_err(dsp,
-- ---						"%s.%d: Failed to write %zd bytes at %d in %s: %d\n",
-- ---						file, regions,
-- ---						to_write, offset,
-- ---						region_name, ret);
-- ---					goto out_fw;
-- ---				}
-     
-     				data += to_write;
-     				reg += to_write / 2;
-     				remain -= to_write;
++ +++			buf = wm_adsp_buf_alloc(region->data,
++ +++						le32_to_cpu(region->len),
++ +++						&buf_list);
++ +++			if (!buf) {
++ +++				adsp_err(dsp, "Out of memory\n");
++ +++				ret = -ENOMEM;
++ +++				goto out_fw;
++ +++			}
+     
 - ---				data += to_write;
 - ---				reg += to_write / 2;
 - ---				remain -= to_write;
++ +++			ret = regmap_raw_write_async(regmap, reg, buf->buf,
++ +++						     le32_to_cpu(region->len));
++ +++			if (ret != 0) {
++ +++				adsp_err(dsp,
++ +++					"%s.%d: Failed to write %d bytes at %d in %s: %d\n",
++ +++					file, regions,
++ +++					le32_to_cpu(region->len), offset,
++ +++					region_name, ret);
++ +++				goto out_fw;
      			}
      		}