From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lee Jones Subject: [PATCH 07/13] ASoC: ux500_pcm: Extract MSP IDs from Device Tree Date: Wed, 6 Nov 2013 10:16:19 +0000 Message-ID: <1383732985-18928-8-git-send-email-lee.jones@linaro.org> References: <1383732985-18928-1-git-send-email-lee.jones@linaro.org> Return-path: In-Reply-To: <1383732985-18928-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, Lee Jones , alsa-devel@alsa-project.org, Mark Brown List-Id: alsa-devel@alsa-project.org This is required for indexing pre-defined channel configuration structures. Cc: alsa-devel@alsa-project.org Cc: Mark Brown Signed-off-by: Lee Jones --- sound/soc/ux500/ux500_msp_i2s.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index 1ca8b08..0a99372 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -665,6 +665,13 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, sizeof(struct msp_i2s_platform_data), GFP_KERNEL); if (!platform_data) return -ENOMEM; + + if (!of_property_read_u32(np, "id", + &platform_data->id)) { + dev_err(&pdev->dev, + "No 'id' property found in DT\n"); + return -EINVAL; + } } } else if (!platform_data) -- 1.8.1.2