From patchwork Mon Sep 2 09:06:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2852775 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F1C1FC0AB5 for ; Mon, 2 Sep 2013 09:06:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE15B204AF for ; Mon, 2 Sep 2013 09:06:28 +0000 (UTC) Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B2E8204AC for ; Mon, 2 Sep 2013 09:06:27 +0000 (UTC) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id r8296QIw028368 for ; Mon, 2 Sep 2013 04:06:27 -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 r8296QtZ027237 for ; Mon, 2 Sep 2013 04:06:26 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Mon, 2 Sep 2013 04:06:26 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id r8296QJk003114 for ; Mon, 2 Sep 2013 04:06:26 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 9CD9B8062C for ; Mon, 2 Sep 2013 04:06:26 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 8F8EF80626 for ; Mon, 2 Sep 2013 04:06:17 -0500 (CDT) Received: from neches.ext.ti.com (neches.ext.ti.com [192.91.81.29]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id r8296Em7000932 for ; Mon, 2 Sep 2013 04:06:14 -0500 (CDT) Received: from mail6.bemta8.messagelabs.com (mail6.bemta8.messagelabs.com [216.82.243.55]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id r8296Eqc003945 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 2 Sep 2013 04:06:14 -0500 Received: from [216.82.242.131:14785] by server-13.bemta-8.messagelabs.com id BD/00-22645-60554225; Mon, 02 Sep 2013 09:06:14 +0000 X-Env-Sender: weiyj.lk@gmail.com X-Msg-Ref: server-13.tower-76.messagelabs.com!1378112770!40512458!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 22582 invoked from network); 2 Sep 2013 09:06:12 -0000 Received: from mail-bk0-f42.google.com (HELO mail-bk0-f42.google.com) (209.85.214.42) by server-13.tower-76.messagelabs.com with RC4-SHA encrypted SMTP; 2 Sep 2013 09:06:12 -0000 Received: by mail-bk0-f42.google.com with SMTP id my10so1470238bkb.15 for ; Mon, 02 Sep 2013 02:06:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=Dh+kaKEAYy0Df3NnyNjCecRPDAhV3ME3RRPpFBL3Vhc=; b=r2DY/FPvvAaHwuAB0dJ9K6c7FkzaDCDev7E8ureKz23ZbNM1eBtCXaSGkbI1nEr482 Gh6Nm79bI7tYf+v2gi/MRHDI97nGCEVZIFdD+cnWvngZSYgiSK6lWNHxoOiWcy+KRsvl j9c0dZYBdWkh2TuFOISWM/X//7XX597MdeCXnzP4Aeh7PyTNRDHfuCIYmuyGDFt5fEo3 fjk6feGAumGYNnniByCbopSkyCwDFrZbtpMX1eVq5vZ4HVd4BBburz3Wgczyn+zCffXD gvDdSM8EVx5XhUGtrdZMzn96HwdMo8tbEz978ZL0bDWIiJB3VAGWw6lJf0zCEaTBd6Sk p5Ug== MIME-Version: 1.0 X-Received: by 10.205.64.9 with SMTP id xg9mr590122bkb.30.1378112770305; Mon, 02 Sep 2013 02:06:10 -0700 (PDT) Received: by 10.205.13.74 with HTTP; Mon, 2 Sep 2013 02:06:10 -0700 (PDT) In-Reply-To: References: Date: Mon, 2 Sep 2013 17:06:10 +0800 Message-ID: Subject: [PATCH -next v2] [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 --- v1 -> v2: fix mistake using -ENOMEM --- 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 = -ENODEV; goto probe_subdev_out; } v4l2_info(&vpif_obj.v4l2_dev,