mirror of
https://github.com/torvalds/linux
synced 2024-09-23 12:56:39 +00:00
Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
0a105ddb35
|
@ -61,6 +61,8 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (memcmp(fw->data, "WMFW", 4) != 0) {
|
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",
|
dev_err(codec->dev, "%s: firmware has bad file magic %08x\n",
|
||||||
name, data32);
|
name, data32);
|
||||||
goto err;
|
goto err;
|
||||||
|
|
|
@ -209,9 +209,10 @@ static int __devinit hx4700_audio_probe(struct platform_device *pdev)
|
||||||
snd_soc_card_hx4700.dev = &pdev->dev;
|
snd_soc_card_hx4700.dev = &pdev->dev;
|
||||||
ret = snd_soc_register_card(&snd_soc_card_hx4700);
|
ret = snd_soc_register_card(&snd_soc_card_hx4700);
|
||||||
if (ret)
|
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)
|
static int __devexit hx4700_audio_remove(struct platform_device *pdev)
|
||||||
|
|
Loading…
Reference in a new issue