From patchwork Thu Apr 18 03:18:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2457391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 13D323FCA5 for ; Thu, 18 Apr 2013 03:18:44 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USfMk-0000pc-VX; Thu, 18 Apr 2013 03:18:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1USfMi-000398-OH; Thu, 18 Apr 2013 03:18:28 +0000 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1USfMc-00038j-Fw for linux-arm-kernel@lists.infradead.org; Thu, 18 Apr 2013 03:18:24 +0000 Received: by mail-wi0-f179.google.com with SMTP id l13so1758159wie.12 for ; Wed, 17 Apr 2013 20:18:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=HRCAmjAewjfeQMxEXv+Gvs5mVcZiCxu7SW10cfEdeic=; b=ssuW/2k6WT2MfKRlMVWF2EXci5P29HFD6I55ddi7tsxa0DFhpT3AAcdlJmX04EeatR BvTx3mqQnPa/Xc18WpnBcJp4fJZwcNs0VEoZn2tcrfh3Zdpsa1REhG0yBYpaPS2WiUIm aDhILPbdPKG+b5BvWrwB0q9EJj7WRR9vYbLTJPsEPZjo3aXdv4PpaPL4mUCzCEt1G6uT ePQ38EGJ06+J+bXZuyo6RjjDInbF+XcgZgFGb97xDmC2i0nQtuaR1ETqK3rBY/olF9HW GcDOosxZRwWLhk8WkXPYQbs+VvLxsmNB9iFo5SbHDBvlYqTYpsoHU7e7sG3aBW7ZujC/ lAkQ== MIME-Version: 1.0 X-Received: by 10.180.36.235 with SMTP id t11mr14899521wij.1.1366255099412; Wed, 17 Apr 2013 20:18:19 -0700 (PDT) Received: by 10.194.51.1 with HTTP; Wed, 17 Apr 2013 20:18:19 -0700 (PDT) Date: Thu, 18 Apr 2013 11:18:19 +0800 Message-ID: Subject: [PATCH -next] [media] s5p-mfc: fix error return code in s5p_mfc_probe() From: Wei Yongjun To: kyungmin.park@samsung.com, k.debski@samsung.com, jtp.park@samsung.com, mchehab@redhat.com, grant.likely@linaro.org, rob.herring@calxeda.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130417_231822_702423_58259E32 X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (weiyj.lk[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: yongjun_wei@trendmicro.com.cn, devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Wei Yongjun Fix to return a negative error code from the error handling case instead of 0, as returned elsewhere in this function. Signed-off-by: Wei Yongjun Acked-by: Kamil Debski --- drivers/media/platform/s5p-mfc/s5p_mfc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index e810b1a..a5853fa 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1110,7 +1110,8 @@ static int s5p_mfc_probe(struct platform_device *pdev) } if (pdev->dev.of_node) { - if (s5p_mfc_alloc_memdevs(dev) < 0) + ret = s5p_mfc_alloc_memdevs(dev); + if (ret < 0) goto err_res; } else { dev->mem_dev_l = device_find_child(&dev->plat_dev->dev,