From patchwork Mon Oct 15 13:13:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1593881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 9F86BDFB34 for ; Mon, 15 Oct 2012 13:15:56 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TNkUM-0007uH-1k; Mon, 15 Oct 2012 13:13:46 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TNkUD-0007td-1v for linux-arm-kernel@lists.infradead.org; Mon, 15 Oct 2012 13:13:37 +0000 Received: by mail-wi0-f171.google.com with SMTP id hj13so1521317wib.0 for ; Mon, 15 Oct 2012 06:13:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=wzKC/5UKf3R1qDmFQMuA1Er75JU99SDCBa4/Dg8pBIg=; b=DjQ7HLENNo4M7LCWaP2zCB1WsN3y7uY2+ixldE+2uvb+V9agDzv53pl62p/mhpDwRP UsVQwXzi6JqOyekzg+cUaDw69JUk3xZWRyj39F/xY2+cOzPazUDpRl+EKLOeOGX+gtQy CJHlt+8u0Er4SSlzcOSc77XYceksRpHc3ooiQWNQ6zfHkG/Fl/z9Atx3VXycnCBtwINZ 1WaydtJjNwB6/+fJxZN6y0bfGyv26j9nc8MWwVpUAMsRe27tZ7iuGwgzREUmdVPlXKWZ Ie5ZqdPyXVChLPgSkv3ND8W/oxwtpCX9vz4jCJmbtYYsMoun3ft8lnGRQm0bVq9ogXGI oQqQ== Received: by 10.216.139.137 with SMTP id c9mr6946976wej.54.1350306815343; Mon, 15 Oct 2012 06:13:35 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id dm3sm15817436wib.3.2012.10.15.06.13.32 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 06:13:33 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] ASoC: ux500_msp_i2s: Fix devm_* and return code merge error Date: Mon, 15 Oct 2012 14:13:26 +0100 Message-Id: <1350306806-5688-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350306806-5688-1-git-send-email-lee.jones@linaro.org> References: <1350306806-5688-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmVpXYC/ZpNk9MyI1kJYIceBARUTG11Nop6ege2JkNMIz8i97daBGeAsW53WcosH/78sqBA X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.171 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: alsa-devel@alsa-project.org, linus.walleij@stericsson.com, arnd@arndb.de, Mark Brown , Lee Jones , Liam Girdwood X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Some ux500_msp_i2s patches clashed with: b18e93a493626c1446f9788ebd5844d008bbf71c ASoC: ux500_msp_i2s: better use devm functions and fix error return code ... leaving the driver uncompilable. This patch fixes the issues encountered. Cc: alsa-devel@alsa-project.org Cc: Liam Girdwood Cc: Mark Brown Acked-by: Linus Walleij Signed-off-by: Lee Jones Acked-by: Ulf Hansson --- sound/soc/ux500/ux500_msp_i2s.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/soc/ux500/ux500_msp_i2s.c b/sound/soc/ux500/ux500_msp_i2s.c index b7c996e..a26c6bf 100644 --- a/sound/soc/ux500/ux500_msp_i2s.c +++ b/sound/soc/ux500/ux500_msp_i2s.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -697,14 +698,11 @@ int ux500_msp_i2s_init_msp(struct platform_device *pdev, platform_data = devm_kzalloc(&pdev->dev, sizeof(struct msp_i2s_platform_data), GFP_KERNEL); if (!platform_data) - ret = -ENOMEM; + return -ENOMEM; } } else if (!platform_data) - ret = -EINVAL; - - if (ret) - goto err_res; + return -EINVAL; dev_dbg(&pdev->dev, "%s: Enter (name: %s, id: %d).\n", __func__, pdev->name, platform_data->id);