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

Commit 0a105ddb authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 43a95197 497d4965

sound/soc/codecs/wm8958-dsp2.c

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name, 
	}



	if (memcmp(fw->data, "WMFW", 4) != 0) {

		memcpy(&data32, fw->data, sizeof(data32));

		data32 = be32_to_cpu(data32);

		dev_err(codec->dev, "%s: firmware has bad file magic %08x\n",

			name, data32);

		goto err;

sound/soc/pxa/hx4700.c

+3 −2
Original line number Diff line number Diff line
@@ -209,9 +209,10 @@ static int __devinit hx4700_audio_probe(struct platform_device *pdev) 
	snd_soc_card_hx4700.dev = &pdev->dev;

	ret = snd_soc_register_card(&snd_soc_card_hx4700);

	if (ret)

		return ret;

		gpio_free_array(hx4700_audio_gpios,

				ARRAY_SIZE(hx4700_audio_gpios));



	return 0;

	return ret;

}



static int __devexit hx4700_audio_remove(struct platform_device *pdev)