From patchwork Fri Aug 23 03:00:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2848524 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1ED379F239 for ; Fri, 23 Aug 2013 03:01:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BEF9F202DB for ; Fri, 23 Aug 2013 03:01:01 +0000 (UTC) Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 53DE9202C7 for ; Fri, 23 Aug 2013 03:00:57 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id r7N30uwU027880 for ; Thu, 22 Aug 2013 22:00:56 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id r7N30uU2008260 for ; Thu, 22 Aug 2013 22:00:56 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Thu, 22 Aug 2013 22:00:55 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id r7N30u9r013861 for ; Thu, 22 Aug 2013 22:00:56 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 02DF480626 for ; Thu, 22 Aug 2013 22:00:56 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 4D25080626 for ; Thu, 22 Aug 2013 22:00:05 -0500 (CDT) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id r7N305Pn024103 for ; Thu, 22 Aug 2013 22:00:05 -0500 (CDT) Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id r7N30471012063 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 22 Aug 2013 22:00:04 -0500 Received: from [216.82.253.163:45459] by server-12.bemta-7.messagelabs.com id 38/0D-03683-430D6125; Fri, 23 Aug 2013 03:00:04 +0000 X-Env-Sender: weiyj.lk@gmail.com X-Msg-Ref: server-5.tower-166.messagelabs.com!1377226802!12291049!1 X-Originating-IP: [209.85.214.42] X-SpamReason: No, hits=0.3 required=7.0 tests=ML_RADAR_SPEW_LINKS_14, RCVD_BY_IP,spamassassin: X-StarScan-Received: X-StarScan-Version: 6.9.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8585 invoked from network); 23 Aug 2013 03:00:03 -0000 Received: from mail-bk0-f42.google.com (HELO mail-bk0-f42.google.com) (209.85.214.42) by server-5.tower-166.messagelabs.com with RC4-SHA encrypted SMTP; 23 Aug 2013 03:00:03 -0000 Received: by mail-bk0-f42.google.com with SMTP id my10so30932bkb.15 for ; Thu, 22 Aug 2013 20:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=MYLPQIloLxLAEU6mX/tzoYnZ+Q+Yhba8XSM3FHX2VhU=; b=lizebNCQyOUsAe1h2CGFUbwu7Lm2MsIpT1Ix7g8pYADxwAzG12CwpKIHERGhE1ddbC EmvjPSo2rgWuqdq+gMwTkmzXOvPeGatF8On22Pq6IaB7JdWwvmOtxrLgtkwAofovYz+1 RCoEEmmWT8aYgs32UkBplFgf345XSviQ4eRksU+UaITAZV+BtFgal7ZNu9mBq0TtBa13 01U3fkUJbaxsN+by5j7aQ36wDkULnZURFhlX+JTBXnduvByfVB1zScWgXR9gpvZUInIU SHPnCSd0yBSaxk43a0BdjDGlSIypSD9Z0quiBWCcw3qk2KsxORmKQLLpcfgDlkcUM8mE gFgw== MIME-Version: 1.0 X-Received: by 10.205.120.78 with SMTP id fx14mr12992216bkc.7.1377226801816; Thu, 22 Aug 2013 20:00:01 -0700 (PDT) Received: by 10.205.13.74 with HTTP; Thu, 22 Aug 2013 20:00:01 -0700 (PDT) Date: Fri, 23 Aug 2013 11:00:01 +0800 Message-ID: Subject: [PATCH -next] [media] davinci: vpif_capture: fix error return code in vpif_probe() From: Wei Yongjun To: , CC: , , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yongjun Fix to return -ENODEV in the subdevice register error handling case instead of 0, as done elsewhere in this function. Introduced by commit 873229e4fdf34196aa5d707957c59ba54c25eaba ([media] media: davinci: vpif: capture: add V4L2-async support) Signed-off-by: Wei Yongjun Acked-by: Lad, Prabhakar --- drivers/media/platform/davinci/vpif_capture.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 7fbde6d..e4b6a26 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -2160,6 +2160,7 @@ static __init int vpif_probe(struct platform_device *pdev) if (!vpif_obj.sd[i]) { vpif_err("Error registering v4l2 subdevice\n"); + err = -ENOMEM; goto probe_subdev_out; } v4l2_info(&vpif_obj.v4l2_dev,