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: 20015 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VGQ5W-00022B-Cg; Mon, 02 Sep 2013 11:06:22 +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 1VGQ5T-0006Iv-3Z; Mon, 02 Sep 2013 11:06:22 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758589Ab3IBJGN (ORCPT + 1 other); Mon, 2 Sep 2013 05:06:13 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:47394 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758154Ab3IBJGL (ORCPT ); Mon, 2 Sep 2013 05:06:11 -0400 Received: by mail-bk0-f51.google.com with SMTP id mx10so1424184bkb.24 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: prabhakar.csengg@gmail.com Cc: m.chehab@samsung.com, yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org, davinci-linux-open-source@linux.davincidsp.com 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.9.2.85715 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_1100_1199 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, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 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 -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(+) -- 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/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,