From patchwork Tue Aug 5 07:13:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaowei Yuan X-Patchwork-Id: 4676201 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 13FC1C0338 for ; Tue, 5 Aug 2014 07:17:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5AC10200E9 for ; Tue, 5 Aug 2014 07:17:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75841200E6 for ; Tue, 5 Aug 2014 07:17:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756317AbaHEHRB (ORCPT ); Tue, 5 Aug 2014 03:17:01 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:48436 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756310AbaHEHRA (ORCPT ); Tue, 5 Aug 2014 03:17:00 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N9T00GFRO89KIB0@mailout1.samsung.com>; Tue, 05 Aug 2014 16:16:57 +0900 (KST) X-AuditID: cbfee61a-f79e46d00000134f-34-53e084e98c8a Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 6A.C9.04943.9E480E35; Tue, 05 Aug 2014 16:16:57 +0900 (KST) Received: from localhost ([109.123.123.72]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N9T00HSKO7PEH20@mmp2.samsung.com>; Tue, 05 Aug 2014 16:16:57 +0900 (KST) From: Zhaowei Yuan To: linux-media@vger.kernel.org, k.debski@samsung.com, m.chehab@samsung.com, kyungmin.park@samsung.com, jtp.park@samsung.com Cc: linux-samsung-soc@vger.kernel.org Subject: [PATCH] media: s5p_mfc: Release ctx->ctx if failed to allocate ctx->shm Date: Tue, 05 Aug 2014 15:13:17 +0800 Message-id: <1407222797-14350-1-git-send-email-zhaowei.yuan@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGJMWRmVeSWpSXmKPExsVy+t9jQd2XLQ+CDVY2mFkcWXuVyeLH6wts Fmeb3rBb9GzYymox4/w+JouL6+Qd2Dz6tqxi9Pi8SS6AKYrLJiU1J7MstUjfLoEr41rbZtaC /WwVk9dNZm9gvMDaxcjJISFgIrH01h1GCFtM4sK99WxdjFwcQgLTGSU+LlzDAuH8ZpTon7WN DaSKTUBXYuWdzWDdIgJ1EhvmvmMGsZkFVCX+rf8DZgsLBEhM/nEfrJ4FKP7x0w+wDbwCHhLf mk8B2RxA2xQk5kyymcDIvYCRYRWjaGpBckFxUnquoV5xYm5xaV66XnJ+7iZGsO+fSe1gXNlg cYhRgINRiYdXQO1+sBBrYllxZe4hRgkOZiUR3mUND4KFeFMSK6tSi/Lji0pzUosPMUpzsCiJ 8x5otQ4UEkhPLEnNTk0tSC2CyTJxcEo1MGYENP1LlZc/N3+f+oOzrvYv6pNkp1YeSjISlJVa O+uHa8i+a9NObg1ScfVY22D1csED/WvbHM/IzNqW+rxyuhRn5TM549ebny3liy0Lvb/NZVev +GOB/ZUPvt/8eT7i/8R1IsnTVtXMMW52fvY+sj98w4XzoWzTpi/qYf7N8k8gV+bEq8kOovlK LMUZiYZazEXFiQA2woS++QEAAA== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Zhaowei Yuan --- drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" 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-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c old mode 100644 new mode 100755 index 58ec7bb..dc00aea --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c @@ -228,6 +228,7 @@ static int s5p_mfc_alloc_instance_buffer_v5(struct s5p_mfc_ctx *ctx) ret = s5p_mfc_alloc_priv_buf(dev->mem_dev_l, &ctx->shm); if (ret) { mfc_err("Failed to allocate shared memory buffer\n"); + s5p_mfc_release_priv_buf(dev->mem_dev_l, &ctx->ctx); return ret; }