From patchwork Fri Oct 19 13:30:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12374 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 0B96A241A5 for ; Fri, 19 Oct 2012 13:31:33 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id AECCAA18C39 for ; Fri, 19 Oct 2012 13:31:32 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so566510iej.11 for ; Fri, 19 Oct 2012 06:31:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=+2AbLP2y67t2xH1QzlwEL/dHq2gYBDV3UfD/UdiHKhA=; b=CVyDAWfMaKX45jssPawDv5Qan/BfEtRipm/GvA41k9ryLnFv8I4km5dh+zwnxyoNph Ag+RI6PSgSTt2fGu+U+MU4M5b2hWJgyC3qk37JGBwy7dYr1b3zNLPEFm/qbpuRgyzl3w JG3dtrKlYx7ZPEqzgocYW6NKdBrbBztPSHRIARP2BPSPurEEZyRMugJGelz362kjQTlK Pe0apcDxN42ADnBPEftTMRkepKmdrr69ZJ1pReVEDxbUs8l9j+NO//DG7rJWS0eKfFsW 0rKS0dfAoN2j29uLCEfc+76nIUd99PKl9xU61NzKqVBLs5+mCC5o85WVpdIbl4MPoSIS Kf6w== Received: by 10.50.88.233 with SMTP id bj9mr1212388igb.70.1350653492168; Fri, 19 Oct 2012 06:31:32 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp87060igt; Fri, 19 Oct 2012 06:31:30 -0700 (PDT) Received: by 10.14.213.197 with SMTP id a45mr1955127eep.3.1350653489942; Fri, 19 Oct 2012 06:31:29 -0700 (PDT) Received: from eu1sys200aog114.obsmtp.com (eu1sys200aog114.obsmtp.com [207.126.144.137]) by mx.google.com with SMTP id n49si1265765eeo.25.2012.10.19.06.31.16 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 06:31:29 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.137 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.137; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.137 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) smtp.mail=ulf.hansson@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKUIFWJCp2h63mxeh3AZZJr/asnROSzCK7@postini.com; Fri, 19 Oct 2012 13:31:29 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 1CA48EA; Fri, 19 Oct 2012 13:30:41 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 929BD4826; Fri, 19 Oct 2012 13:30:41 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id AC815A8081; Fri, 19 Oct 2012 15:30:35 +0200 (CEST) Received: from steludxu1397.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 19 Oct 2012 15:30:38 +0200 From: Ulf Hansson To: Liam Girdwood , Mark Brown , , Cc: , Linus Walleij , Lee Jones , Julia Lawall , Ulf Hansson Subject: [PATCH 1/2] ASoC: Ux500: Fixup complile errors due to merge Date: Fri, 19 Oct 2012 15:30:26 +0200 Message-ID: <1350653427-28611-1-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkHZ60lrxIKvWZY6+B8FiaZlgN0sVJsAt4kCri4llx9Vy9AWpq77pNssC2X6ypMut/D96kA From: Ulf Hansson Likely during merge of the below commits ended up breaking compilation: ASoC: Ux500: Enable ux500 MSP driver for Device Tree ASoC: ux500_msp_i2s: better use devm functions and fix error return code Signed-off-by: Ulf Hansson --- sound/soc/ux500/ux500_msp_i2s.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index b7c996e..e6ff328 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -692,19 +692,15 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, if (!msp) return -ENOMEM; - if (np) { - if (!platform_data) { - platform_data = devm_kzalloc(&pdev->dev, - sizeof(struct msp_i2s_platform_data), GFP_KERNEL); - if (!platform_data) - ret = -ENOMEM; - } - } else + if (np && !platform_data) { + platform_data = devm_kzalloc(&pdev->dev, + sizeof(struct msp_i2s_platform_data), GFP_KERNEL); if (!platform_data) - ret = -EINVAL; + return -ENOMEM; + } - if (ret) - goto err_res; + if (!platform_data) + return -EINVAL; dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__, pdev->name, platform_data->id);