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: 12230 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 3D5C123F9B for ; Mon, 15 Oct 2012 13:13:39 +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 E4CDDA1991C for ; Mon, 15 Oct 2012 13:13:38 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so7544881iej.11 for ; Mon, 15 Oct 2012 06:13:38 -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:in-reply-to:references :x-gm-message-state; bh=wzKC/5UKf3R1qDmFQMuA1Er75JU99SDCBa4/Dg8pBIg=; b=er5HpI7xM3P/qDCfC6/lHS0Kfjli6KCqUOOLBNFtFQ2/oqMXEudAS0/g8WOa9p0sJ5 LrX54mdCqcxY1xCvW/xRl0i+CUupaCgGm0/wNNnlCX93WfNOIlRZNo/0dKzXN3NTFaFF 77XdIS6tq9AGJ0JSIPH8LwONHgGy537/vqtdgPTtt9G9/IZp7agJKKPspN8lMdnnT5yX mrGej+t89KBYL8ICqDd5sS/qSDZ9uegkurJEmtLuZZi2Parp5++Mq8QkeeobcCnTNjvT yCyZRdlxMtUX9CXlOVDejXA1+Pb59EbL7I0LTWo53U3ozgH2VPSf+2dW5aaD9dV3UysC fBkQ== Received: by 10.50.152.137 with SMTP id uy9mr8455951igb.62.1350306817372; Mon, 15 Oct 2012 06:13:37 -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 n20csp572549igt; Mon, 15 Oct 2012 06:13:36 -0700 (PDT) Received: by 10.180.87.42 with SMTP id u10mr23842798wiz.0.1350306815898; Mon, 15 Oct 2012 06:13:35 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id b16si16712663weq.158.2012.10.15.06.13.35 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 06:13:35 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f178.google.com with SMTP id r6so3744743wey.37 for ; Mon, 15 Oct 2012 06:13:35 -0700 (PDT) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones , alsa-devel@alsa-project.org, Liam Girdwood , Mark Brown 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: ALoCoQnuotoZeNyidQRpCTujYGUrUm5IAxwIcg2eouJF8WTZ6BGFw908DB0Xj5qYzy/x8rmosrfw 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 --- 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);