Merge tag 'trace-v4.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[deliverable/linux.git] / sound / soc / davinci / davinci-mcasp.c

diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
index 237dc67002efbefd600f96bb76997d21890a8b9f..05c2d33aa74dd9273100c9e8edf1b00bb57d8e35 100644 (file)
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
@@ -1599,7 +1599,14 @@ static struct davinci_mcasp_pdata *davinci_mcasp_set_pdata_from_of(
                pdata = pdev->dev.platform_data;
                return pdata;
        } else if (match) {
-               pdata = (struct davinci_mcasp_pdata*) match->data;
+               pdata = devm_kmemdup(&pdev->dev, match->data, sizeof(*pdata),
+                                    GFP_KERNEL);
+               if (!pdata) {
+                       dev_err(&pdev->dev,
+                               "Failed to allocate memory for pdata\n");
+                       ret = -ENOMEM;
+                       return pdata;
+               }
        } else {
                /* control shouldn't reach here. something is wrong */
                ret = -EINVAL;