From patchwork Fri Aug 23 02:59:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 19886 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VChbJ-0001qx-Nx; Fri, 23 Aug 2013 04:59:49 +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-8) with esmtp id 1VChbH-0005Ls-li; Fri, 23 Aug 2013 04:59:49 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753963Ab3HWC7p (ORCPT + 1 other); Thu, 22 Aug 2013 22:59:45 -0400 Received: from mail-bk0-f45.google.com ([209.85.214.45]:44281 "EHLO mail-bk0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753958Ab3HWC7p (ORCPT ); Thu, 22 Aug 2013 22:59:45 -0400 Received: by mail-bk0-f45.google.com with SMTP id mx11so31864bkb.32 for ; Thu, 22 Aug 2013 19:59:44 -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=9ZoinRxZ15ab0ft1K1loAoN2SNWRJSREt1/5j/P2e3Y=; b=ZZi138tihukTMR9n+YwMfCVPMtZCS2dSIcaharghHXiWaRqvyW/BMwlUfzMIe+UoUf 2x2p4+woRI6H7ooXyRYUkYzpt/p5GMXlfoWUdDAqO0THr+n6Qe8DVlO+edqMRzWUqVC7 teGN4UwcMH3vu+6p5lxkSJ+viqMHgsZNzmqzor3HyJc6lGVr/dZrblP2NFswsAwjaaAr IgGmFxG+mfNO9eI5OOgt2frKIJojVyyzdvFpjf+A9Y9U73H8Jgs9E/kdCgqtFOSoAksI ovEkneF5h9S1P771f5ZAx9RzN2UfrdAvg6neMneHFdC5ivdo4WH2+yEPMYZIH0DxOTu9 uD5w== MIME-Version: 1.0 X-Received: by 10.204.224.77 with SMTP id in13mr9482203bkb.24.1377226784153; Thu, 22 Aug 2013 19:59:44 -0700 (PDT) Received: by 10.205.13.74 with HTTP; Thu, 22 Aug 2013 19:59:44 -0700 (PDT) Date: Fri, 23 Aug 2013 10:59:44 +0800 Message-ID: Subject: [PATCH -next] [media] davinci: vpif_display: fix error return code in vpif_probe() From: Wei Yongjun To: prabhakar.csengg@gmail.com, m.chehab@samsung.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.8.23.25128 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, __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. Introduce by commit 4b8a531e6bb0686203e9cf82a54dfe189de7d5c2. ([media] media: davinci: vpif: display: add V4L2-async support) Signed-off-by: Wei Yongjun Acked-by: Lad, Prabhakar --- drivers/media/platform/davinci/vpif_display.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_display.c b/drivers/media/platform/davinci/vpif_display.c index 6336dfc..0e03b9a 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -1824,6 +1824,7 @@ static __init int vpif_probe(struct platform_device *pdev) NULL); if (!vpif_obj.sd[i]) { vpif_err("Error registering v4l2 subdevice\n"); + err = -ENODEV; goto probe_subdev_out; }