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: 18047 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1USfMd-0004V8-Nw; Thu, 18 Apr 2013 05:18:23 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1USfMd-0003Ow-Cu; Thu, 18 Apr 2013 05:18:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965389Ab3DRDSV (ORCPT + 1 other); Wed, 17 Apr 2013 23:18:21 -0400 Received: from mail-wi0-f175.google.com ([209.85.212.175]:32931 "EHLO mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965364Ab3DRDSU (ORCPT ); Wed, 17 Apr 2013 23:18:20 -0400 Received: by mail-wi0-f175.google.com with SMTP id h11so1156374wiv.2 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 Cc: yongjun_wei@trendmicro.com.cn, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, devicetree-discuss@lists.ozlabs.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.4.18.30326 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' 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(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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,