From patchwork Tue May 7 11:51:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 18310 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UZgQZ-0006vZ-Nq; Tue, 07 May 2013 13:51:27 +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.72/mailfrontend-6) with esmtp id 1UZgQX-0000FH-4W; Tue, 07 May 2013 13:51:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757035Ab3EGLvX (ORCPT + 1 other); Tue, 7 May 2013 07:51:23 -0400 Received: from mail-bk0-f43.google.com ([209.85.214.43]:61637 "EHLO mail-bk0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756225Ab3EGLvW (ORCPT ); Tue, 7 May 2013 07:51:22 -0400 Received: by mail-bk0-f43.google.com with SMTP id jm19so240951bkc.30 for ; Tue, 07 May 2013 04:51:21 -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=Ga5qA+A2NhbemKZspJ1ILwDXJleUxGr5+zkYA70l5LQ=; b=rPx/UHHMQrQf5ayMG1LFMawJHTvgwcHf6TdMTHx6B/gjz84oJxsbtkmQbbYmTr89TO or7tFgz++9S7TD536hhjcrDzHxUnpyPzcipxXfYNj1qNVk9fC8OW4EPf6yEtRURllBKg 562BWhhdlVWhJEBc1Zqhhn/56yDoZnZXu11EukxL1ePYS3B8YgusFRTJE5tWRvuZn0g7 Xuf0VQ60fCIBo5gVzXx+d9h85t4C3XZsGfstA2K8ApGvGCwDOMDRQiVfFxdogrreVzQq ug70A+IoQXAED0wJ5Y0C7MntF1xI+vHuIHQyyRK8Jt9GcePGoehVgsiYbF1LVuKPWH2O g/hg== MIME-Version: 1.0 X-Received: by 10.204.172.80 with SMTP id k16mr468592bkz.123.1367927481287; Tue, 07 May 2013 04:51:21 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Tue, 7 May 2013 04:51:21 -0700 (PDT) Date: Tue, 7 May 2013 19:51:21 +0800 Message-ID: Subject: [PATCH] [media] davinci: vpfe: fix error return code in vpfe_probe() From: Wei Yongjun To: mchehab@redhat.com, gregkh@linuxfoundation.org, prabhakar.csengg@gmail.com, sakari.ailus@iki.fi, yongjun_wei@trendmicro.com.cn, manjunath.hadli@ti.com Cc: linux-media@vger.kernel.org, devel@driverdev.osuosl.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.5.7.114222 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_1400_1499 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 done elsewhere in this function. Signed-off-by: Wei Yongjun Acked-by: Lad, Prabhakar --- drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 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/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c index b88e1dd..d8ce20d 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c @@ -639,7 +639,8 @@ static int vpfe_probe(struct platform_device *pdev) if (ret) goto probe_free_dev_mem; - if (vpfe_initialize_modules(vpfe_dev, pdev)) + ret = vpfe_initialize_modules(vpfe_dev, pdev); + if (ret) goto probe_disable_clock; vpfe_dev->media_dev.dev = vpfe_dev->pdev; @@ -663,7 +664,8 @@ static int vpfe_probe(struct platform_device *pdev) /* set the driver data in platform device */ platform_set_drvdata(pdev, vpfe_dev); /* register subdevs/entities */ - if (vpfe_register_entities(vpfe_dev)) + ret = vpfe_register_entities(vpfe_dev); + if (ret) goto probe_out_v4l2_unregister; ret = vpfe_attach_irq(vpfe_dev);