From patchwork Mon May 13 05:49:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 18380 X-Patchwork-Delegate: sylvester.nawrocki@gmail.com Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UbldP-0005Uj-S8; Mon, 13 May 2013 07:49:19 +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 1UbldO-0006qS-jG; Mon, 13 May 2013 07:49:19 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753375Ab3EMFtQ (ORCPT + 1 other); Mon, 13 May 2013 01:49:16 -0400 Received: from mail-bk0-f47.google.com ([209.85.214.47]:49274 "EHLO mail-bk0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072Ab3EMFtP (ORCPT ); Mon, 13 May 2013 01:49:15 -0400 Received: by mail-bk0-f47.google.com with SMTP id jg9so2213742bkc.34 for ; Sun, 12 May 2013 22:49:14 -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=oxDNMGF2tFghkDk4+A2HjjzqTxgb7kGPQJFiL3TVU7w=; b=nR/j2TF77Goy8gNtq8CKEUKDCqMQdHnqkqoq8ig8AsbIGodqkeJqgIS/ehaOoF+OXv IAEvFFUixAD2SArZ3h5yBgnYZVSIMi6dVV35Vw9GBBE7W9eRZ29aOVQZPrPknoVg1DgK 62w1ecrnxojba6jg4NLST4B5gM45fqJMYinxzwJCHg8VHu5YG69U3F4H6vS95BHbmcOW 053RU4ZAP+CnsZa4VRmPvY4K1Y9qA23rauvUZPuGeETFvall9drdqV1QL7yh1VC81N7D +zl3duSn1t6iJRd4u9Jor6fJGAJi2XfDuKjBPMGw25oDCUGyYSjOeQZiBC6C3mTDW0uk 782A== MIME-Version: 1.0 X-Received: by 10.204.62.137 with SMTP id x9mr5133166bkh.90.1368424153893; Sun, 12 May 2013 22:49:13 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Sun, 12 May 2013 22:49:13 -0700 (PDT) Date: Mon, 13 May 2013 13:49:13 +0800 Message-ID: Subject: [PATCH] [media] s5p-tv: fix error return code in mxr_acquire_video() From: Wei Yongjun To: kyungmin.park@samsung.com, t.stanislaws@samsung.com, mchehab@redhat.com Cc: yongjun_wei@trendmicro.com.cn, linux-arm-kernel@lists.infradead.org, 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.5.13.53917 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_1200_1299 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, __INT_PROD_TV 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 in the vb2_dma_contig_init_ctx() error handling case instead of 0, as done elsewhere in this function. Also vb2_dma_contig_init_ctx() return ERR_PTR() in case of error and never return NULL, so use IS_ERR() replace IS_ERR_OR_NULL(). Signed-off-by: Wei Yongjun --- drivers/media/platform/s5p-tv/mixer_video.c | 3 ++- 1 file changed, 2 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/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c index ef0efdf..641b1f0 100644 --- a/drivers/media/platform/s5p-tv/mixer_video.c +++ b/drivers/media/platform/s5p-tv/mixer_video.c @@ -81,8 +81,9 @@ int mxr_acquire_video(struct mxr_device *mdev, } mdev->alloc_ctx = vb2_dma_contig_init_ctx(mdev->dev); - if (IS_ERR_OR_NULL(mdev->alloc_ctx)) { + if (IS_ERR(mdev->alloc_ctx)) { mxr_err(mdev, "could not acquire vb2 allocator\n"); + ret = PTR_ERR(mdev->alloc_ctx); goto fail_v4l2_dev; }