| Message ID | 1397652390-852-10-git-send-email-peter.ujfalusi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/16/2014 02:46 PM, Peter Ujfalusi wrote: [...] > + return omap_pcm_platform_register(&pdev->dev); > +} > } There is a excess } here.
On 04/21/2014 03:54 PM, Lars-Peter Clausen wrote: > On 04/16/2014 02:46 PM, Peter Ujfalusi wrote: > [...] >> + return omap_pcm_platform_register(&pdev->dev); >> +} >> } > There is a excess } here. Aargh, true. I don't have omap-hdmi available to build in my config since I do not have display support enabled for omap4/omap5. Will send a patch to fix it asap. Thanks, Péter
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c index ced3b88b44d4..32614b49653c 100644 --- a/sound/soc/omap/omap-hdmi.c +++ b/sound/soc/omap/omap-hdmi.c @@ -36,6 +36,7 @@ #include <video/omapdss.h> #include "omap-hdmi.h" +#include "omap-pcm.h" #define DRV_NAME "omap-hdmi-audio-dai" @@ -324,7 +325,11 @@ static int omap_hdmi_probe(struct platform_device *pdev) ret = snd_soc_register_component(&pdev->dev, &omap_hdmi_component, &omap_hdmi_dai, 1); - return ret; + if (ret) + return ret; + + return omap_pcm_platform_register(&pdev->dev); +} } static int omap_hdmi_remove(struct platform_device *pdev)
Use the same device for the platform driver when registering as the dai driver. This will enable us to clean up some DT booted cases. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- sound/soc/omap/omap-hdmi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)