From patchwork Fri Oct 19 12:24:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 1618321 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id CAA52DF2AB for ; Fri, 19 Oct 2012 12:24:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754139Ab2JSMYi (ORCPT ); Fri, 19 Oct 2012 08:24:38 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:47472 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752671Ab2JSMYh (ORCPT ); Fri, 19 Oct 2012 08:24:37 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MC500EF33T0ODV0@mailout3.samsung.com> for linux-media@vger.kernel.org; Fri, 19 Oct 2012 21:24:36 +0900 (KST) X-AuditID: cbfee61a-b7f976d000001eb9-26-508146843402 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 24.66.07865.48641805; Fri, 19 Oct 2012 21:24:36 +0900 (KST) Received: from amdc1344.digital.local ([106.116.147.32]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MC5002XE3SKU150@mmp2.samsung.com> for linux-media@vger.kernel.org; Fri, 19 Oct 2012 21:24:36 +0900 (KST) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: sw0312.kim@samsung.com, Sylwester Nawrocki , Kyungmin Park Subject: [PATCH] s5p-fimc: Don't ignore return value of vb2_queue_init() Date: Fri, 19 Oct 2012 14:24:18 +0200 Message-id: <1350649458-15065-1-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJJMWRmVeSWpSXmKPExsVy+t9jQd0Wt8YAg7ndfBY9G7ayOjB6fN4k F8AYxWWTkpqTWZZapG+XwJVxuXMtW8EmwYpVT9YzNzAu4O9i5OSQEDCRmPDjKQuELSZx4d56 ti5GLg4hgemMErNXzoRyVjBJ/Gj+xQpSxSZgKNF7tI8RxBYRkJd40nuDDcRmFiiRmL7mAxOI LSzgITFv5yOwGhYBVYlNR1aB1fAKuElMWvAfqIYDaJuCxJxJNhMYuRcwMqxiFE0tSC4oTkrP NdQrTswtLs1L10vOz93ECPbgM6kdjCsbLA4xCnAwKvHw/rrdECDEmlhWXJl7iFGCg1lJhNeN vTFAiDclsbIqtSg/vqg0J7X4EKM0B4uSOG+zR0qAkEB6YklqdmpqQWoRTJaJg1OqgTG4idWo grnLb1f4/TU2v38mZxytX656W/xm6+yaOyUGVvu1i19e5pixMnZZw/cPMikH3pYm3LK6+nzZ nHd9j3xU32fvyFxcI3zb3Sm0Yeb0V912+42a848c69n5QH+mEVeJeNslm+kx+Y5vfx/lDZzj 5vBQZavxBRPzgA+3r/gK2MhPP6x1PkOJpTgj0VCLuag4EQBeAHGn3AEAAA== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Add missing checks for return value of vb2_queue_init(), after this function has been modified recently to not throw BUG_ON(). This eliminates related compiler warnings, drivers/media/platform/s5p-fimc/fimc-lite.c: In function fimc_lite_subdev_registered: drivers/media/platform/s5p-fimc/fimc-lite.c:1256:16: warning: ignoring return value of vb2_queue_init, declared with attribute warn_unused_result [-Wunused-result] drivers/media/platform/s5p-fimc/fimc-capture.c: In function fimc_register_capture_device: drivers/media/platform/s5p-fimc/fimc-capture.c:1739:16: warning: ignoring return value of vb2_queue_init, declared with attribute warn_unused_result [-Wunused-result] Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park --- drivers/media/platform/s5p-fimc/fimc-capture.c | 4 +++- drivers/media/platform/s5p-fimc/fimc-lite.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/s5p-fimc/fimc-capture.c b/drivers/media/platform/s5p-fimc/fimc-capture.c index ae756f6..cf6cdeb 100644 --- a/drivers/media/platform/s5p-fimc/fimc-capture.c +++ b/drivers/media/platform/s5p-fimc/fimc-capture.c @@ -1736,7 +1736,9 @@ static int fimc_register_capture_device(struct fimc_dev *fimc, q->mem_ops = &vb2_dma_contig_memops; q->buf_struct_size = sizeof(struct fimc_vid_buffer); - vb2_queue_init(q); + ret = vb2_queue_init(q); + if (ret) + goto err_ent; vid_cap->vd_pad.flags = MEDIA_PAD_FL_SINK; ret = media_entity_init(&vfd->entity, 1, &vid_cap->vd_pad, 0); diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.c b/drivers/media/platform/s5p-fimc/fimc-lite.c index bfbb22c..0376cfe 100644 --- a/drivers/media/platform/s5p-fimc/fimc-lite.c +++ b/drivers/media/platform/s5p-fimc/fimc-lite.c @@ -1282,7 +1282,9 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd) q->buf_struct_size = sizeof(struct flite_buffer); q->drv_priv = fimc; - vb2_queue_init(q); + ret = vb2_queue_init(q); + if (ret < 0) + return ret; fimc->vd_pad.flags = MEDIA_PAD_FL_SINK; ret = media_entity_init(&vfd->entity, 1, &fimc->vd_pad, 0);