Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[karo-tx-linux.git] / sound / soc / ux500 / ux500_msp_dai.c

diff --git a/sound/soc/ux500/ux500_msp_dai.c b/sound/soc/ux500/ux500_msp_dai.c
index 45e43b4057b0661b71afe8767806cf72fdf183f5..be94bf9bf94f51b31b4ba5d1aaeeeabcc58ea043 100644 (file)
--- a/sound/soc/ux500/ux500_msp_dai.c
+++ b/sound/soc/ux500/ux500_msp_dai.c
@@ -760,6 +760,9 @@ static int __devinit ux500_msp_drv_probe(struct platform_device *pdev)
        drvdata = devm_kzalloc(&pdev->dev,
                                sizeof(struct ux500_msp_i2s_drvdata),
                                GFP_KERNEL);
+       if (!drvdata)
+               return -ENOMEM;
+
        drvdata->fmt = 0;
        drvdata->slots = 1;
        drvdata->tx_mask = 0x01;