From patchwork Mon May 13 05:48:45 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 2556361 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 A3CE4DF2E5 for ; Mon, 13 May 2013 05:48:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753230Ab3EMFsr (ORCPT ); Mon, 13 May 2013 01:48:47 -0400 Received: from mail-bk0-f48.google.com ([209.85.214.48]:64484 "EHLO mail-bk0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752889Ab3EMFsq (ORCPT ); Mon, 13 May 2013 01:48:46 -0400 Received: by mail-bk0-f48.google.com with SMTP id jf3so2182194bkc.7 for ; Sun, 12 May 2013 22:48:45 -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=lKOQBNhacb3xQZ0B3nzUNwblDfSPGReBI/4m7wwhYS4=; b=LTn8W2A2WEbw3WiGaeMTkgpgLjmaheSWUO0e3px5wi0BknBTQrLJfOtuB0CdmXn/n/ E4O2wXq9gy0/k/5oPFW0GnrJl2Ji9Lpk9vCUONlDDhPvSEO0ZG/B0yFoHKTtcOoVj1gn avCUmGkp2mVBkXvN0rfFBUdMGZMw28WdTI+I3HiWKqtfpjn8+TuIE2me0f/zmW5cFwcq XSzAFq5RU1ZQxSQLpePQBx0bF3K/dZm9urfRkHTCfVuhQJKbHo+7sWhz10v5WLPzWJN9 C3aA7HOsESAXut4KYrjY6zzT6312OhG6wTBLFAqdNjogfWyu38h23mLKqWuqwzzXLpU+ 5HHA== MIME-Version: 1.0 X-Received: by 10.204.172.80 with SMTP id k16mr5228093bkz.123.1368424125492; Sun, 12 May 2013 22:48:45 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Sun, 12 May 2013 22:48:45 -0700 (PDT) Date: Mon, 13 May 2013 13:48:45 +0800 Message-ID: Subject: [PATCH] [media] v4l: vb2: fix error return code in __vb2_init_fileio() From: Wei Yongjun To: pawel@osciak.com, m.szyprowski@samsung.com, kyungmin.park@samsung.com, mchehab@redhat.com 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 From: Wei Yongjun Fix to return -EINVAL in the get kernel address error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun Reviewed-by: Sakari Ailus Acked-by: Marek Szyprowski --- drivers/media/v4l2-core/videobuf2-core.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/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c index 7d833ee..7bd3ee6 100644 --- a/drivers/media/v4l2-core/videobuf2-core.c +++ b/drivers/media/v4l2-core/videobuf2-core.c @@ -2193,8 +2193,10 @@ static int __vb2_init_fileio(struct vb2_queue *q, int read) */ for (i = 0; i < q->num_buffers; i++) { fileio->bufs[i].vaddr = vb2_plane_vaddr(q->bufs[i], 0); - if (fileio->bufs[i].vaddr == NULL) + if (fileio->bufs[i].vaddr == NULL) { + ret = -EINVAL; goto err_reqbufs; + } fileio->bufs[i].size = vb2_plane_size(q->bufs[i], 0); }