From patchwork Mon May 13 05:57:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 18382 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 1UbllW-0006A8-Pn; Mon, 13 May 2013 07:57:42 +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-5) with esmtp id 1UbllU-0005WZ-9e; Mon, 13 May 2013 07:57:42 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753398Ab3EMF5j (ORCPT + 1 other); Mon, 13 May 2013 01:57:39 -0400 Received: from mail-bk0-f49.google.com ([209.85.214.49]:50118 "EHLO mail-bk0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750904Ab3EMF5i (ORCPT ); Mon, 13 May 2013 01:57:38 -0400 Received: by mail-bk0-f49.google.com with SMTP id na10so14209bkb.36 for ; Sun, 12 May 2013 22:57:37 -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=CE2OHZZrypDsJag+hiLeJRHyJZpe/e7Qyt8vh8TpJ+k=; b=xuc3CGxi+ukwatM1pO+n6yBpe5rzFJNLcfsaSoNlU/jy/kR0n/YJN2EGaLXk38h5/p ViwJpfuMirKxmU2myYKluwAz7c7QEkN8Vm9QsL0zTCrfwcePqcWjqM7Q6UvBA/gBodU/ pIOW8pkJj3ZYz74NWLAQDiUfDpGZ6dL2f9E8KwrtDmyLyJPY4zrj0Ys2ZY7AAFiDz1Ik ZuSgK1DmBJcX2QWBDK6Omw/USSXEkliH/9COFElPYqx/KCSXNhFD85pAE2nEhgZ0P+Jc GT+mTxPE7J+X/j+WkdINnegq2ZAsMowYXtwR5iae7xX5GHeYnyfLj+mKaEMSXJgURuCY rB5g== MIME-Version: 1.0 X-Received: by 10.204.173.9 with SMTP id n9mr5111229bkz.47.1368424657415; Sun, 12 May 2013 22:57:37 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Sun, 12 May 2013 22:57:37 -0700 (PDT) Date: Mon, 13 May 2013 13:57:37 +0800 Message-ID: Subject: [PATCH] [media] vpif_capture: fix error return code in vpif_probe() From: Wei Yongjun To: prabhakar.csengg@gmail.com, mchehab@redhat.com Cc: 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.5.13.55119 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, __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. Signed-off-by: Wei Yongjun Acked-by: Lad, Prabhakar --- 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 5f98df1..ef0fc94 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -2170,6 +2170,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, "registered sub device %s\n",