Merge branch 'for-3.1' into for-3.2 (0f8dd4ce) · Commits · e / devices / android_kernel_teracube_mt6765

MAINTAINERS

+4 −0

Original line number	Diff line number	Diff line
		@@ -7200,6 +7200,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
		S: Supported
		F: Documentation/hwmon/wm83??
		F: drivers/leds/leds-wm83*.c
		F: drivers/input/misc/wm831x-on.c
		F: drivers/input/touchscreen/wm831x-ts.c
		F: drivers/input/touchscreen/wm97*.c
		F: drivers/mfd/wm8*.c
		F: drivers/power/wm83*.c
		F: drivers/rtc/rtc-wm83*.c
		@@ -7209,6 +7212,7 @@ F: drivers/watchdog/wm83*_wdt.c
		F: include/linux/mfd/wm831x/
		F: include/linux/mfd/wm8350/
		F: include/linux/mfd/wm8400*
		F: include/linux/wm97xx.h
		F: include/sound/wm????.h
		F: sound/soc/codecs/wm*

sound/soc/soc-cache.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -203,14 +203,14 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec)
		rbnode = rb_entry(node, struct snd_soc_rbtree_node, node);
		for (i = 0; i < rbnode->blklen; ++i) {
		regtmp = rbnode->base_reg + i;
		WARN_ON(codec->writable_register &&
		codec->writable_register(codec, regtmp));
		val = snd_soc_rbtree_get_register(rbnode, i);
		def = snd_soc_get_cache_val(codec->reg_def_copy, i,
		rbnode->word_size);
		if (val == def)
		continue;

		WARN_ON(!snd_soc_codec_writable_register(codec, regtmp));

		codec->cache_bypass = 1;
		ret = snd_soc_write(codec, regtmp, val);
		codec->cache_bypass = 0;
		@@ -560,8 +560,7 @@ static int snd_soc_lzo_cache_sync(struct snd_soc_codec *codec)

		lzo_blocks = codec->reg_cache;
		for_each_set_bit(i, lzo_blocks[0]->sync_bmp, lzo_blocks[0]->sync_bmp_nbits) {
		WARN_ON(codec->writable_register &&
		codec->writable_register(codec, i));
		WARN_ON(!snd_soc_codec_writable_register(codec, i));
		ret = snd_soc_cache_read(codec, i, &val);
		if (ret)
		return ret;
		@@ -820,8 +819,6 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)

		codec_drv = codec->driver;
		for (i = 0; i < codec_drv->reg_cache_size; ++i) {
		WARN_ON(codec->writable_register &&
		codec->writable_register(codec, i));
		ret = snd_soc_cache_read(codec, i, &val);
		if (ret)
		return ret;
		@@ -829,6 +826,9 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
		if (snd_soc_get_cache_val(codec->reg_def_copy,
		i, codec_drv->reg_word_size) == val)
		continue;

		WARN_ON(!snd_soc_codec_writable_register(codec, i));

		ret = snd_soc_write(codec, i, val);
		if (ret)
		return ret;

sound/soc/soc-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1635,7 +1635,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
		if (codec->readable_register)
		return codec->readable_register(codec, reg);
		else
		return 0;
		return 1;
		}
		EXPORT_SYMBOL_GPL(snd_soc_codec_readable_register);

		@@ -1653,7 +1653,7 @@ int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
		if (codec->writable_register)
		return codec->writable_register(codec, reg);
		else
		return 0;
		return 1;
		}
		EXPORT_SYMBOL_GPL(snd_soc_codec_writable_register);

sound/soc/soc-dapm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2771,7 +2771,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);

		/**
		* snd_soc_dapm_free - free dapm resources
		* @card: SoC device
		* @dapm: DAPM context
		*
		* Free all dapm widgets and resources.
		*/