[alsa-devel] [PATCH 6/7] ASoC: Samsung: neo1973_gta02: Fix bluetooth DAI registration

[Mark Brown]

On Mon, Feb 07, 2011 at 12:04:22AM +0100, Lars-Peter Clausen wrote:
> This patch fixes two issues with the bluethooth DAI registration:
> * The DAI has to be registered only after the sound device has been added.

This isn't a problem, components in the system can be registered in any
order.

> * Currently the DAI is registered with snd_soc_register_dai which causes it to
>   be named after the device it was registered for. Which is in this case the
>   "soc-audio" device. (Ab)use snd_soc_register_dais which causes the DAI to be
>   named after the DAI driver, which is what we want in this case.

This doesn't tie up with your change which...

> -	/* register bluetooth DAI here */
> -	ret = snd_soc_register_dai(&neo1973_gta02_snd_device->dev, &bt_dai);
> -	if (ret)
> -		goto err_put_device;

> +	/* register bluetooth DAI here */
> +	ret = snd_soc_register_dais(&neo1973_gta02_snd_device->dev, &bt_dai, 1);
>  	if (ret)
> -		goto err_unregister_dai;
> +		goto err_unregister_device;

...uses the same device in both cases and looking briefly at the code
both register functions just use the dev that was passed in.  In any
case, we clearly shouldn't be applying patches which bodge around the
core.