Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5ef3f2a authored by Nicolin Chen's avatar Nicolin Chen Committed by Mark Brown
Browse files

ASoC: wm8962: Fix null pointer pdata access in I2C probe() 



When using DT binding to pass private data, there would be Kernel panic
occuring due to NULL pointer access in wm8962_i2c_probe(). Thus fix it.

Signed-off-by: default avatarNicolin Chen <b42378@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 78b78f5c

sound/soc/codecs/wm8962.c

+7 −7
Original line number Diff line number Diff line
@@ -3616,28 +3616,28 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, 
			   0);



	/* Apply static configuration for GPIOs */

	for (i = 0; i < ARRAY_SIZE(pdata->gpio_init); i++)

		if (pdata->gpio_init[i]) {

	for (i = 0; i < ARRAY_SIZE(wm8962->pdata.gpio_init); i++)

		if (wm8962->pdata.gpio_init[i]) {

			wm8962_set_gpio_mode(wm8962, i + 1);

			regmap_write(wm8962->regmap, 0x200 + i,

				     pdata->gpio_init[i] & 0xffff);

				     wm8962->pdata.gpio_init[i] & 0xffff);

		}





	/* Put the speakers into mono mode? */

	if (pdata->spk_mono)

	if (wm8962->pdata.spk_mono)

		regmap_update_bits(wm8962->regmap, WM8962_CLASS_D_CONTROL_2,

				   WM8962_SPK_MONO_MASK, WM8962_SPK_MONO);



	/* Micbias setup, detection enable and detection

	 * threasholds. */

	if (pdata->mic_cfg)

	if (wm8962->pdata.mic_cfg)

		regmap_update_bits(wm8962->regmap, WM8962_ADDITIONAL_CONTROL_4,

				   WM8962_MICDET_ENA |

				   WM8962_MICDET_THR_MASK |

				   WM8962_MICSHORT_THR_MASK |

				   WM8962_MICBIAS_LVL,

				   pdata->mic_cfg);

				   wm8962->pdata.mic_cfg);



	/* Latch volume update bits */

	regmap_update_bits(wm8962->regmap, WM8962_LEFT_INPUT_VOLUME,
@@ -3682,7 +3682,7 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, 
	}



	if (wm8962->irq) {

		if (pdata->irq_active_low) {

		if (wm8962->pdata.irq_active_low) {

			trigger = IRQF_TRIGGER_LOW;

			irq_pol = WM8962_IRQ_POL;

		} else {