From patchwork Wed Sep 11 14:10:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 20054 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VJl7l-0002Zn-Qj; Wed, 11 Sep 2013 16:10:29 +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 1VJl7k-0007He-3L; Wed, 11 Sep 2013 16:10:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753973Ab3IKOK0 (ORCPT + 1 other); Wed, 11 Sep 2013 10:10:26 -0400 Received: from mail-bk0-f50.google.com ([209.85.214.50]:48725 "EHLO mail-bk0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752763Ab3IKOKZ (ORCPT ); Wed, 11 Sep 2013 10:10:25 -0400 Received: by mail-bk0-f50.google.com with SMTP id mz11so3582475bkb.37 for ; Wed, 11 Sep 2013 07:10:24 -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=N47YwWwRs1dxCuCgA+N/LOycjF+k/RMoIsER4bR9tL8=; b=k11fEp4ffMrImt7ms5sSYeSf03nhwqz/YqBkthP5Z+HDY+xk4BZbAjPtqhODtCMs9E su6mnS0fTExslT/uVzOQ8bPB0lsNiOzhFbxLrwS97Kiu+Em0WOH9zevb4AeshSYWX/Se F9wORC8K+4JDxxyHuDUS0xV4kzBrkc1deBICV1LEKQj+dkkcQ+6E/muTQlKRkPJr2rB6 bpqMvN6szZ2lNPZPg1b8rIsrj5wkNfSbanU+3UHhrmrOQ5UPJ9ybJ8wqdy1nq9RKeRzp hNTITepeqMa+PB9lHwTdTz0uCFRA7czFdbnAJhtvnAKpZxTO47cjCQ+oJgpaH3ZaFoC+ Urjw== MIME-Version: 1.0 X-Received: by 10.204.167.140 with SMTP id q12mr1670937bky.2.1378908624612; Wed, 11 Sep 2013 07:10:24 -0700 (PDT) Received: by 10.205.13.74 with HTTP; Wed, 11 Sep 2013 07:10:24 -0700 (PDT) Date: Wed, 11 Sep 2013 22:10:24 +0800 Message-ID: Subject: [PATCH] [media] v4l: vsp1: fix error return code in vsp1_video_init() From: Wei Yongjun To: m.chehab@samsung.com, laurent.pinchart+renesas@ideasonboard.com, sakari.ailus@iki.fi Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org 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.11.140015 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_MEDIA_BODY 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 a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun Acked-by: Laurent Pinchart --- drivers/media/platform/vsp1/vsp1_video.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 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/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index 714c53e..4b0ac07 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -1026,8 +1026,10 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf) /* ... and the buffers queue... */ video->alloc_ctx = vb2_dma_contig_init_ctx(video->vsp1->dev); - if (IS_ERR(video->alloc_ctx)) + if (IS_ERR(video->alloc_ctx)) { + ret = PTR_ERR(video->alloc_ctx); goto error; + } video->queue.type = video->type; video->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;