Skip to contentSkip to conversation

ASoC: wm8523: Fix array size for bclk_ratios

PATCH In review Axel Lin 2 participants 4 messages Aug 2, 2017

Subsystems (3)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/2 ASoC: wm8523: Fix array size for bclk_ratios

ARRAY_SIZE(bclk_ratios) returns 7 for current code, then it cannot catch the error if "no matching BCLK/fs ratio". Fix it.

---
 sound/soc/codecs/wm8523.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8523.c +1 -1
index 6d0a272..b1e4ce7 100644
@@ -116,7 +116,7 @@ static struct {
 static struct {
 	int value;
 	int ratio;
-} bclk_ratios[WM8523_NUM_RATES] = {
+} bclk_ratios[] = {
 	{ 2, 32 },
 	{ 3, 64 },
 	{ 4, 128 },
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH 2/2 ASoC: wm8523: Constfiy lrclk_ratios and bclk_ratios

---
 sound/soc/codecs/wm8523.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8523.c +2 -2
index b1e4ce7..c7c33e9 100644
@@ -100,7 +100,7 @@ static const struct snd_soc_dapm_route wm8523_dapm_routes[] = {
 	{ "LINEVOUTR", NULL, "DAC" },
 };
 
-static struct {
+static const struct {
 	int value;
 	int ratio;
 } lrclk_ratios[WM8523_NUM_RATES] = {
@@ -113,7 +113,7 @@ static struct {
 	{ 7, 1152 },
 };
 
-static struct {
+static const struct {
 	int value;
 	int ratio;
 } bclk_ratios[] = {
Signature · 1 line
2.9.3
maintainer
#2 lore raw

Applied "ASoC: wm8523: Constfiy lrclk_ratios and bclk_ratios" to the asoc tree

The patch

ASoC: wm8523: Constfiy lrclk_ratios and bclk_ratios

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From c0d088f04f115409287003b5fc0dfd3184d7d306 Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
Date: Wed, 2 Aug 2017 17:55:14 +0800
Subject: [PATCH] ASoC: wm8523: Constfiy lrclk_ratios and bclk_ratios

---
 sound/soc/codecs/wm8523.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8523.c +2 -2
index b1e4ce72e533..c7c33e98fbcb 100644
@@ -100,7 +100,7 @@ static const struct snd_soc_dapm_route wm8523_dapm_routes[] = {
 	{ "LINEVOUTR", NULL, "DAC" },
 };
 
-static struct {
+static const struct {
 	int value;
 	int ratio;
 } lrclk_ratios[WM8523_NUM_RATES] = {
@@ -113,7 +113,7 @@ static struct {
 	{ 7, 1152 },
 };
 
-static struct {
+static const struct {
 	int value;
 	int ratio;
 } bclk_ratios[] = {
Signature · 1 line
2.13.2
maintainer
#3 lore raw

Applied "ASoC: wm8523: Fix array size for bclk_ratios" to the asoc tree

In reply to Axel Lin

The patch

ASoC: wm8523: Fix array size for bclk_ratios

has been applied to the asoc tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Quoted 1 line

From 19b4b7292615358b9599ff9410a3e564b4844e90 Mon Sep 17 00:00:00 2001

From: Axel Lin <[email protected]>
Date: Wed, 2 Aug 2017 17:55:13 +0800
Subject: [PATCH] ASoC: wm8523: Fix array size for bclk_ratios

ARRAY_SIZE(bclk_ratios) returns 7 for current code, then it cannot catch the error if "no matching BCLK/fs ratio". Fix it.

---
 sound/soc/codecs/wm8523.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm8523.c +1 -1
index 6d0a2723bfde..b1e4ce72e533 100644
@@ -116,7 +116,7 @@ static struct {
 static struct {
 	int value;
 	int ratio;
-} bclk_ratios[WM8523_NUM_RATES] = {
+} bclk_ratios[] = {
 	{ 2, 32 },
 	{ 3, 64 },
 	{ 4, 128 },
Signature · 1 line
2.13.2